[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L38600000960763138 into tm-qpr3-release.

COASTGUARD_SKIP: I0dcb59ede3af0d610b79a4b610eb89e4121e2dc7
COASTGUARD_SKIP: I2f9275ef117caa93c09d4d24e3a17f588e4ca600

Change-Id: Ida076dc7b181ca7ddb27998ddf5b1963a003cc85