[coastguard skipped] Merge sparse cherrypicks from sparse-10216780-L93500000960937337 into tm-qpr3-release.

COASTGUARD_SKIP: I2bc487cf92477db51bdc31868a8482a070af9453
COASTGUARD_SKIP: I436c26447b04ecd03d74721b55a4a31386bcaaa9

Change-Id: I22fe32106e63b5b96db6d2b0ce67fd23eeb8b834