[coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L55900000958663479 into tm-qpr2-release.

COASTGUARD_SKIP: I744b6d718affa4026a676f92b76c016b36d07592
COASTGUARD_SKIP: Iea66d7782b3365dea827b854783aeddaa5c6699c

Change-Id: Id0fbc60e1aec414a4b76821afa473a9a17107541