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

COASTGUARD_SKIP: Ie698acacc96e7913d3b09523a558bc7d06d7277e
COASTGUARD_SKIP: I16ff0d703ae1b57ab2090a6c8c3225c477be3591

Change-Id: Ic0f50fe376a58e2887f4d7bdc1391db06cd19508