Merge cherrypicks of [17911860] into sparse-8547507-L12600000954433473. Change-Id: If98b99824c1a441e6ea4332481459e6a4796f061