[coastguard skipped] Merge sparse cherrypicks from sparse-10235405-L65000000961314396 into udc-release.
COASTGUARD_SKIP: Ib3ccd3b6cdc9354a8cb68b39bad5ffc660b57b6e Change-Id: I36baefbea8cb1985b548f2b254308837d87cf3e8
This commit is contained in:
COASTGUARD_SKIP: Ib3ccd3b6cdc9354a8cb68b39bad5ffc660b57b6e Change-Id: I36baefbea8cb1985b548f2b254308837d87cf3e8