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

COASTGUARD_SKIP: I1d55954e56a3f995f8dd48bf484fe9fce02b2ed1
COASTGUARD_SKIP: Iabbac6600bddf7f723185ee0b0d9611f36e2c9df

Change-Id: If2420354c7cdaff9bf412b10118eafc216888ed9