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

COASTGUARD_SKIP: I29c1b4199fcdfa8b70ceea99637c53f5bdbd5ba7
COASTGUARD_SKIP: I8acb3306d89fcc48bb2f435663e2736c92436227

Change-Id: Id45c5639d9005b7695844eff3bb038c1c8667f3c