[coastguard skipped] Merge sparse cherrypicks from sparse-10415351-L71400000961983299 into udc-release.

COASTGUARD_SKIP: I5701a96daeea414c6eb38c5ad8c4a49de31709c6

Change-Id: I1ebc6fac4a662c1c504741d25afa88c4f35d8031