Snap for 10360508 from 6060f0ce0df4e594c0a95da944e98f6c236cc80b to udc-release

Change-Id: Ibbd1e465380a9594685a3e6c3073f338891ca9a8