Merge cherrypicks of [1954678] into sparse-8072972-L41500000952748579.

Change-Id: Ic0c410cc67facbb19b03d3faebd8700923bb1b03