Snap for 9414774 from d0cae5676383f64eedaf15aec65d590887f8e1d5 to udc-release

Change-Id: I8f5d3753456d5b093bb838bb190797947ef12233