Snap for 10277839 from 02f9786911ced1c5541671c528f6865475d7cc47 to udc-release

Change-Id: I628e08aaf330dc65a3569c438105a0f245208ff8