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

COASTGUARD_SKIP: I15264d21377f5b5ab65130a87290cc10143ed49e
COASTGUARD_SKIP: If1d6318573c40bbf9f9ec82cd8011e62f9f9a2b1

Change-Id: I4010ec7959d4a3d78ea1bcf7113b2165c9562955