Snap for 10025836 from a937e2cadd6a1da4c77ed2243fc163d8d39adf20 to udc-release

Change-Id: I7ceac8b2da5d912764e2ba882cfee86e4d9b2cd3