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

COASTGUARD_SKIP: Ifa1abdd0d978db868c6a4bef7a35c4dd6aabb2d1
COASTGUARD_SKIP: If49dce98f3155f3144a766c26b5a3a39401ce1b2

Change-Id: I5b26169b3976ec93851f0543319e429baaf3b710