Snap for 8474914 from 443b31c8ccc631f8bf17878fa8a9028ce9568b9b to udc-release

Change-Id: I87d75c8bed45ede8fccc59ed273d2c0d76a06c9b