Snap for 9505375 from d8fdcce387491b9957453c213deffbe92e53ea3c to udc-release

Change-Id: Ia9b945e239926a05904372e55b8e9d3edcd33f19