Snap for 9675941 from 9494fb208ab523dce6e2e3c87efa854f636b6bda to udc-release

Change-Id: I724205a5f934f7e82c36cf98650f9bb5c5fbed6d