Merge cherrypicks of [16373492] into sparse-7698606-L38200000952402237.

Change-Id: I72f950957ed7b970ae17b73edce5a59f65551de1