[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L38600000960763138 into tm-qpr3-release.
COASTGUARD_SKIP: I39035ebc5a1ed4b381d83b49409f7de08dc7f533 COASTGUARD_SKIP: Ibfc2ed623ae95d06381021f4a82962079acfd30e Change-Id: I220a4b7d3f214da83486fe956fefcaf7335e6c9e
This commit is contained in:
commit
77c38d17b9