Merge cherrypicks of [19632855] into sparse-8927612-L71600000956100018.

Change-Id: I6b0c8b98a1caec004c95bb5045665e0af0bac65e