[coastguard skipped] Merge sparse cherrypicks from sparse-9313799-L44000000957495194 into tm-d4-release.

Change-Id: I6f97b133ed09f2177b389309d74583dc8382a68c