[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release.
COASTGUARD_SKIP: Idd5c7d8e8446219b728c87314272f81a676bdd12 COASTGUARD_SKIP: Id3f4538f3dea1c232d130099b8f2df6d8fe87eee Change-Id: I6f36f2ebe90fdb800ab307378a79379ebefb87ce
This commit is contained in:
commit
818211fcbf