[coastguard skipped] Merge sparse cherrypicks from sparse-9605534-L22400000958611218 into tm-qpr2-release.

COASTGUARD_SKIP: I196656f106aa51b03aec1da5406df3a900fdb14c
COASTGUARD_SKIP: Iddb8619be7bdd9767211e44913e8ba3871bc6580

Change-Id: I435921f07e4ef4078dc449067e89f90db627b847