[coastguard skipped] Merge sparse cherrypicks from sparse-9721558-L05300000959046533 into tm-qpr2-release.

COASTGUARD_SKIP: I73a244a6fe3306330fb53595f21b50245f051e32
COASTGUARD_SKIP: I6071d2b93c9bf7338cba8f3317493f512f790f26

Change-Id: Ic1d4c89c6088a4f8ac922e79b9c8a85cc2ec2b80