[coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L64000000958893796 into tm-qpr2-release.
COASTGUARD_SKIP: I26522141e5e48797c500d3b58653ba6c70383c0b Change-Id: Id64f3eeb0aa597b23d0755837961f34979169c6f
This commit is contained in:
COASTGUARD_SKIP: I26522141e5e48797c500d3b58653ba6c70383c0b Change-Id: Id64f3eeb0aa597b23d0755837961f34979169c6f