Snap for 8183730 from e863e8b505c2a6ab4a881966460c27cc5e645fc0 to udc-release

Change-Id: I91c3266eadbd2115bcb964b6712de2bb38d517fe