[coastguard skipped] Merge sparse cherrypicks from sparse-10615697-L42300000962409643 into udc-release.
COASTGUARD_SKIP: I00b411f7706aed897b0d78550f1109afe54c7b46 Change-Id: Ic7dfb1103eb143c854bd6aa55a3fc53f3e4e484b
This commit is contained in:
COASTGUARD_SKIP: I00b411f7706aed897b0d78550f1109afe54c7b46 Change-Id: Ic7dfb1103eb143c854bd6aa55a3fc53f3e4e484b