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

Change-Id: I763f400a955e3d44f97a1154823c7edceab29a18