Snap for 10255809 from fe745609cab8a852513df2b9008e0b666b2134b8 to udc-release

Change-Id: If0569538aacf46a143d1fa196d36ca6f866432b3