[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L38600000960763138 into tm-qpr3-release.

COASTGUARD_SKIP: Id0fbe60ce32e431ee9234c012287d71a58ba3eeb
COASTGUARD_SKIP: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39

Change-Id: I6a7eb0a58d32a480f4f911510ef3c63ca54b83c4