Snap for 10269577 from 1c0abe1c170c175de8c3ab596fe29ee77bef61ad to udc-release

Change-Id: Ie47f6d0e15fc5d34dab43ce5fae54b4112ddd7e6