Snap for 9613524 from 0708b486a343eb01c50f8a87ea4bf253e80a0734 to udc-release

Change-Id: I715aa9922819e4be6c4f24278f3d1e64c92dabaf