[coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L75600000958834478 into tm-qpr2-release.

COASTGUARD_SKIP: Ic15cd2ee23b54a5d479eab1538936142be08327c

Change-Id: I4901494d29f52f2ff4b1d72262178381cd53430d