[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release.

COASTGUARD_SKIP: I8a4001cc7c4898ed50ae0fd0e62b4eec9364b219
COASTGUARD_SKIP: I17d48910cd87583118621a76b81c8023c2dfd39d

Change-Id: Ia1673a56b7c561d05af9136d318357c4f5577d2b