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

Change-Id: I8e1428f12ab9bf4cc2b1a322e64b4aa41aa0ae41