Merge backports 20160122

Change-Id: I5bcde969e55b9f1c62879d7ac27ac8cf2efe0043