[coastguard skipped] Merge sparse cherrypicks from sparse-9960280-L07400000960073385 into tm-qpr3-c-release.

COASTGUARD_SKIP: I3773fd2ef819f2b1d7c01d670923eb463f396f4e
COASTGUARD_SKIP: Ia159deccc8f0024143200e4dd44fadf67974a198

Change-Id: I9c416f2e47753162dd2de45a2e739957fb59182e