[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L38600000960763138 into tm-qpr3-release.

COASTGUARD_SKIP: I72296e593ad8d829be085d5f244155a1a2087827
COASTGUARD_SKIP: I17d48910cd87583118621a76b81c8023c2dfd39d

Change-Id: Ie889568adea05683dd7fbbd588270fd1c77f7091