[coastguard skipped] Merge sparse cherrypicks from sparse-10121037-L10400000960889242 into tm-qpr3-release.
COASTGUARD_SKIP: Idd5c7d8e8446219b728c87314272f81a676bdd12 COASTGUARD_SKIP: I97f97d7e531be9855862a75cc6ceac22075ca244 Change-Id: I4dd339ad486c20e4e0de88b4657ef328feabc0ed
This commit is contained in:
commit
b8285571c0