[coastguard skipped] Merge sparse cherrypicks from sparse-10316531-L68800000962056696 into tm-qpr3-release. COASTGUARD_SKIP: Ibe1c289e1b4d3af39fa2423139f134632032c37c COASTGUARD_SKIP: I57132a55a089c7aae3e17c717ecd9dc1047fede8 COASTGUARD_SKIP: I4afb443b7e527038fb42424543bb1538b01d5ec9 Change-Id: Icb6dcb775e65b7efd0e1a84ffe695b0aa6749105