[coastguard skipped] Merge sparse cherrypicks from sparse-10206733-L62800000962797378 into tm-qpr3-release.

COASTGUARD_SKIP: Iec9fd2baee0356bec1293fb68768e3ef1cb43b69

Change-Id: If9601f2dbc526d78a31ebd3ad7161d4110fd579f