[coastguard skipped] Merge sparse cherrypicks from sparse-9991837-L20000000960186230 into tm-qpr3-release.

COASTGUARD_SKIP: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73
COASTGUARD_SKIP: I96512935c366153ea1c3d023fb730ef1fc827692
COASTGUARD_SKIP: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46
COASTGUARD_SKIP: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801

Change-Id: Ieda8cc253f10714c949c6dadead62ee52ce06445