[coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L75600000958834478 into tm-qpr2-release.

COASTGUARD_SKIP: Iddb8619be7bdd9767211e44913e8ba3871bc6580
COASTGUARD_SKIP: I1076102b32fc729cf8d11c737e2e34bb207fb13f

Change-Id: Ife2197792fc58d12a0b4539a407cce919ed88095