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

COASTGUARD_SKIP: If1d6318573c40bbf9f9ec82cd8011e62f9f9a2b1
COASTGUARD_SKIP: Ifcab24e9faaac9c7c50515e5fe9b09944b43cd65

Change-Id: I7e56faca2dda4d1591d5f3568547097a056ef471