Merge cherrypicks of [9434364, 9434203, 9434365, 9433586, 9434204, 9434205, 9433656, 9434206] into sparse-5888992-L32000000368541170

Change-Id: I23e934a1f53788074c220cb0d67b3f170ef15e5e