[coastguard skipped] Merge sparse cherrypicks from sparse-9768758-L34300000959236895 into tm-qpr2-b-release.

COASTGUARD_SKIP: I316a49bc8561db0a8e87f0c4a7dc844a23f23b1e
COASTGUARD_SKIP: I44e0fe374ca436d082cd78f96c0aedab8c93b475

Change-Id: Id651d08150944251236eb0683f14aad88d1c5996