[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L31500000959114895 into tm-qpr2-release.

COASTGUARD_SKIP: I4ecf867cb69f39e8c4087afc0b87f8d721b1e6e3
COASTGUARD_SKIP: Ifa80de5b64d98240119ffb0cd01769afdcd14076
COASTGUARD_SKIP: Iddb8619be7bdd9767211e44913e8ba3871bc6580

Change-Id: Idee1bf1475d1d93fbb88963d9236ddc421200fde