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

COASTGUARD_SKIP: I2bb1848e16aff436787a5bf43dbea18012d485a7
COASTGUARD_SKIP: I9b94fecbdce0ed3fcfa5bb9674d890e1196a0fbe

Change-Id: I39e3f07bfef31d1b2aac7c7f6532fbbb08d3ab98