[coastguard skipped] Merge sparse cherrypicks from sparse-10204971-L19600000960914226 into tm-qpr3-release.
COASTGUARD_SKIP: I39035ebc5a1ed4b381d83b49409f7de08dc7f533 COASTGUARD_SKIP: I935e7fcb32be82a1ce908e6590dedd94f323f044 Change-Id: I70abc2e9d416511e7d21787384c03b8a1e327989
This commit is contained in:
commit
987cfcc35e