Merge cherrypicks of [2136213] into sparse-8771534-L52500000955267267.

Change-Id: Iafd222d12b15fca53c683bdde051d98fe297159c