[coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
COASTGUARD_SKIP: I8bd0f5ef94ca1d5e118a701a4cfff58599537476 COASTGUARD_SKIP: I077f038eb8bf515ea39a096ce8c4820e3af09ea3 Change-Id: I803c919e9df77054be6165dffc496c487ca819d2
This commit is contained in:
commit
163db5e320