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

COASTGUARD_SKIP: I0f578a45ae736ce6e2e6f3ca7585e8f64a7eb36b
COASTGUARD_SKIP: I1d55954e56a3f995f8dd48bf484fe9fce02b2ed1

Change-Id: I86caea1962af6b2f877a193cff6e98017bb22e62