Merge cherrypicks of [4285741, 4285547, 4284105, 4284670, 4284671, 4284672] into pi-release

Change-Id: Id1db54c94efb90a49a7443c9e5b28918f2e18cee