Snap for 10342804 from 29b87774c1b0cdfbeeadbb462cf543ea02e3ab5f to udc-release

Change-Id: Ic5e5a1ffadffcc099a6e8bbdfacae4d77a455c36