[coastguard skipped] Merge sparse cherrypicks from sparse-10019883-L95000000960319046 into udc-release.
COASTGUARD_SKIP: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b COASTGUARD_SKIP: I1134d42db04a871aec6e8472309d5ebd454c7e88 Change-Id: I6ae21ef04084401feb3d0c0a481e927336bc9e94
This commit is contained in: