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

COASTGUARD_SKIP: I28a7b0dde48c391e6502ddf9877a7a1e66b7dc7a
COASTGUARD_SKIP: I0616ce4a686a482c83e202374efbf3851047d1b8
COASTGUARD_SKIP: If9eba1862e49fe31462b8f114b459c21e95d4549

Change-Id: If7da9f5522ae56dd5222a6bca8058f90c90965c0