[coastguard skipped] Merge sparse cherrypicks from sparse-9899552-L49500000959785733 into tm-qpr3-release.

COASTGUARD_SKIP: Ied113ef3e2839872fa4e32eaa9c900f4a53d2348
COASTGUARD_SKIP: I171dd43576875043e3f5887884844edd37c32902

Change-Id: I6ecd50c235d37c541e199daa9c825606d777e7b8