Snap for 9470759 from b1910238209f00b01153a17bd7769562f2d0df47 to udc-release

Change-Id: I132b9e0ee23edfa9ffa6affafd8312f887ea2152