Merge cherrypicks of [2157916] into sparse-8841113-L64900000955518334.

Change-Id: I2a0abf5cb232b1073183d72c142e3e6a731c4208