Snap for 8318243 from 771ad24102d87c83a4a7c14eb1da7c8d74c1488f to udc-release

Change-Id: I0506f26291630a94952897b990e57747a4b2b99e