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

Change-Id: Ie9932347e0edcbc8d3b3355b6e9894a2f5fc6b9a