Merge cherrypicks of [4392181, 4392182, 4392183, 4392184, 4392201, 4392202] into pi-release

Change-Id: I82b5577e2ecdbf50a73df940db72964b9c6969af