Snap for 9552483 from c21a48653e366310bab074187a47e0d7732decbd to udc-release

Change-Id: Ia977ee331f004a41a7ba6d85a2805400403dc290