Merge cherrypicks of [2264842] into sparse-9204414-L41600000956987290.

Change-Id: I6ddb0b90bf8783809be60815787a81fc1b92f089