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

COASTGUARD_SKIP: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
COASTGUARD_SKIP: I293fca48382fcd71a6f055e9c140a183c2c33fdf

Change-Id: Iebb890e09e34560a889f2f62b4358d511ff6e06c