[coastguard skipped] Merge sparse cherrypicks from sparse-9721558-L05300000959046533 into tm-qpr2-release.

COASTGUARD_SKIP: Ib76eb402a8257edbbe12197ce31acfb9158d0260
COASTGUARD_SKIP: Iddb8619be7bdd9767211e44913e8ba3871bc6580

Change-Id: If5e73b56b82aba87679cea9a4a373f71c86a4450