[coastguard skipped] Merge sparse cherrypicks from sparse-10335664-L84700000962189645 into tm-qpr3-c-release.

COASTGUARD_SKIP: Ia22f7922e929876d65b056f10eef8310ea645714
COASTGUARD_SKIP: I50dcfaf2d256de0951749ae9c3fa0b8018eafea5
COASTGUARD_SKIP: I9f9bbcf442cdebf019752a18f20ce46fa5985554
COASTGUARD_SKIP: I40d29acc66929ac11bc5075bedaf227ccb2bb3f1
COASTGUARD_SKIP: I35a0a13558f1db5960d2f50a43875564e1c6ea05

Change-Id: Ieedf89581e3c8fed77060e4ced77869a323a8e14