[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L75300000962528215 into udc-release.
COASTGUARD_SKIP: I73eba1129f4a4d2e42de747e6a51c3201c84693d Change-Id: Id244afbd2d597a6e1668350390dd76be2e2adfb9
This commit is contained in:
COASTGUARD_SKIP: I73eba1129f4a4d2e42de747e6a51c3201c84693d Change-Id: Id244afbd2d597a6e1668350390dd76be2e2adfb9