[coastguard skipped] Merge sparse cherrypicks from sparse-10133821-L62900000960815595 into tm-qpr3-c-release. COASTGUARD_SKIP: I526ccf8a589392acb0890c4f2139eadbf2e87010 COASTGUARD_SKIP: I81efc87f19775dba96bab581a1c443d6070f6ebc Change-Id: Icdf83f79994f9f1351784905c7e8070c8e31a248