Merge cherrypicks of [3927160, 3927161, 3925898, 3925949, 3927795, 3927796, 3927162, 3927227, 3927621] into pi-release

Change-Id: I1345183e5aab111ff89ef9c67563430672125ea6