[coastguard skipped] Merge sparse cherrypicks from sparse-10102984-L51900000960588890 into tm-qpr3-c-release.

COASTGUARD_SKIP: I3679ca4a72aa3585a0a0718013006fff54918893
COASTGUARD_SKIP: I0da65710a06f543539bf788ed8ecfbdd1b28d7cf

Change-Id: Ie1e3d9696029e03c1e95c679b5d5d0fc682cbde8