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

COASTGUARD_SKIP: I8c1b858c8990c60cea48a59fc390f57a40ed86ba
COASTGUARD_SKIP: Ib64dbf2cc9e785d7cf51eed37cc9f610e37df423
COASTGUARD_SKIP: I224c80e2787497634d3e68760122dac5f177585a
COASTGUARD_SKIP: Iede626004a1ea46f47b185777c97794e4d3ded4e
COASTGUARD_SKIP: Id37e395f4f4f05b7901b718e3ea84c56b95cdfe7

Change-Id: Ib8f8546171128e4d2942b858881a7f64fbab1e3b