[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L16700000962543246 into udc-release.
COASTGUARD_SKIP: I09e8877ac2325a0056c931ce01602fffb7e68c35 COASTGUARD_SKIP: I1cf8decc7bbd6b7f2316dbae4f165f09dde1d37f Change-Id: I97d7c785fa95d373cd2caa7f32fb220f2cffda6d
This commit is contained in:
commit
ae5ae75b14