Snap for 9455153 from 07546daa6679da0561bb6088e52828be7764e1e5 to udc-release

Change-Id: I50dd5642f41318ee28a309ed9f662439bc38bbda