[coastguard skipped] Merge sparse cherrypicks from sparse-10231374-L75200000961052022 into tm-qpr3-release.

COASTGUARD_SKIP: Ibf71dcf890e2dea65d0a2096914fd57fdad25fce
COASTGUARD_SKIP: I4cf7a16ffda683a25e1cd6d1cce53940975740e6

Change-Id: Iad80673b6a5435a9fe3d1a8eca619c6417055a7e