[coastguard skipped] Merge sparse cherrypicks from sparse-9380938-L19200000957686535 into tm-release.

Change-Id: Ic9ddee3586279c0627186e0cfeafcc3add3148ad