Snap for 8520545 from 9b5c7ebc8e1c805ce1896661d09efa242a2867c2 to udc-release

Change-Id: I7b8a6e2d2b10ef546366dc4408310a8404b3dd80