[coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L75600000958834478 into tm-qpr2-release.
COASTGUARD_SKIP: Ib247b59ed6636413b840ae9f4baa582fd2492d3e COASTGUARD_SKIP: I2ade29622e6c01ade96a7b15609131635c7ac502 Change-Id: I78d9a704c4cc011957a5089bcadfe3a9a25549a2
This commit is contained in:
commit
0ca34ac08e