[coastguard skipped] Merge sparse cherrypicks from sparse-9282069-L02500000957416337 into tm-d4-release.

Change-Id: I74531e5ee07ff9b2b0592830a2ed3615a4aea037