Merge cherrypicks of [3761525, 3761526, 3762421, 3761280, 3761527, 3761325] into pi-release

Change-Id: Ia7de1626602e496b977e3983c0e8c5cf0a2e75b4