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

COASTGUARD_SKIP: Ia9f8bc6894e62abf3f5c43eadf5fefd702c4d137
COASTGUARD_SKIP: I50dcfaf2d256de0951749ae9c3fa0b8018eafea5
COASTGUARD_SKIP: Ia22f7922e929876d65b056f10eef8310ea645714

Change-Id: Id7a7b53e7a1af7c1ce9c8d759394534bdd6a13ea