[coastguard skipped] Merge sparse cherrypicks from sparse-10317220-L65500000961600299 into tm-qpr3-release.

COASTGUARD_SKIP: I6aaac0307f42201a397183c8a7ee176f3570ea54
COASTGUARD_SKIP: Ieb8af107f427bdbd0146b4b519709ba55f32b389

Change-Id: I5d470107933bd2af1197ccff0aa0a0770f990432