Snap for 9367586 from f9ad592e31b03dfe7b5ff9ddcb369404c3364ad6 to udc-release

Change-Id: Icdece321b7e386b9b13c5511e95f7615bbf8ec18