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

COASTGUARD_SKIP: I7795abe0aebefca2d42998a672abfd12f951d501
COASTGUARD_SKIP: Ie572a0ae8ae4d687b86ea6a4011b4fdc33b43cd7

Change-Id: I1136d0f649849f51731523c4081424ac8a70fbea