[coastguard skipped] Merge sparse cherrypicks from sparse-10252186-L42700000961059379 into tm-qpr3-release.

COASTGUARD_SKIP: Ibcd59f63194e106161ddecfe0e39db5af5223089
COASTGUARD_SKIP: I2ee30dfa5e4170272b5353f270a69b38750a0bd5

Change-Id: I040c41f6dfa863b80acab2683ce44f894eb4b9c4