Snap for 10252918 from 313a19ef4ed197c8668b6513e897c89a8b6583b4 to udc-release

Change-Id: Id18ca67bd2e2a48c2b650f1840193f29afbffd44