[coastguard skipped] Merge sparse cherrypicks from sparse-10316531-L15400000961262887 into tm-qpr3-release.

COASTGUARD_SKIP: I54d3319e45ce8bbd9e13ac1f15b8a3df4d90b7a9
COASTGUARD_SKIP: I5838083d9824bedf1988bf2d5b6ddc32315b52da

Change-Id: I557ab6bcaa50d8cc6e57827e5b53a5262ac6f8bf