[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L98000000959299536 into tm-qpr2-release.

COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: I0cea8c12d9f6903e82d2322a05a878d12c198196
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549

Change-Id: I80c6d8cdb213eaa26132e9cd05b5185540adbe4c