[coastguard skipped] Merge sparse cherrypicks from sparse-9957400-L29100000960006895 into tm-qpr3-release.

COASTGUARD_SKIP: I4480da8f589210cef62146089cd7cfe5974c3e7a
COASTGUARD_SKIP: Ib646478150fe2e30136483757427c84f510e3e04

Change-Id: I766b5035a0372ff95f5b3d0f5e1d6564d83715b3