Merge cherrypicks of [18231932] into sparse-8563200-L30900000954800704.

Change-Id: I66a2238362c3fdfc748ffbb07694a0bb0d619734