Snap for 9666816 from 772787d968ea52c440799b8700fe1feff7762e08 to udc-release

Change-Id: I5062ec60cfa37cd6b40544a69bb2242a49210bd3