Snap for 10376207 from 3c05e56adf5b268ec5b20bf8aec460815e45161c to udc-beta4-release

Change-Id: Ic5bd66c04097fe631b9bb280f935d92962ed1412