[coastguard skipped] Merge sparse cherrypicks from sparse-9605534-L22400000958611218 into tm-qpr2-release.
COASTGUARD_SKIP: Id3ac9f062b3610c32d3905e724589659ff54e097 COASTGUARD_SKIP: I62120770b8dcef9d16143ffcc31ef563f5a3569f Change-Id: I3d8b33b2cd291818740e1dbece4f2f7ffbd4517f
This commit is contained in:
commit
a36ee1a07f