[coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L34400000958984256 into tm-qpr2-release.

COASTGUARD_SKIP: Ibe6d01949102aed6287b037e245515ed06606165

Change-Id: I54c0a108e80dce818c02aad718c456a71a60fe76