[coastguard skipped] Merge sparse cherrypicks from sparse-10231374-L75200000961052022 into tm-qpr3-release.

COASTGUARD_SKIP: I9316eec596fb59d53a37471da1a44cf96a49cdd1
COASTGUARD_SKIP: I835dd545a01eb2fd7990e0fd5ad51bac0e4b1f33

Change-Id: I6734b47bcac2a20fc6c2251d5cc493a677eea792