Merge cherrypicks of [19042674] into sparse-8843490-L48800000955563757.

Change-Id: If8bd6671dffc395c315583b93b693c951885e4f8