Snap for 10353861 from 1db43995a5e1cda14aaa1079bbcd39a1c8ccb8fc to udc-release

Change-Id: Ibed4382e52f3abe54ebed7ca1740e28f8dca297f