[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release.
COASTGUARD_SKIP: I39035ebc5a1ed4b381d83b49409f7de08dc7f533 COASTGUARD_SKIP: I602dae621ff4121d8a9359ce404677b9e9d9c140 Change-Id: I25c1f696e343ec256cabff8e7862e65136196e58
This commit is contained in:
commit
dc6d225fb4