[coastguard skipped] Merge sparse cherrypicks from sparse-10216780-L32300000960937408 into tm-qpr3-release.

COASTGUARD_SKIP: I64ed81d65dc0ec973fe9865d951f11f5def7a040

Change-Id: Iaa9d35acb988853b91ec53acdcd2120009605aac