Snap for 9553927 from 6ef3959c8a0b48ab01be3b39579cbe5f8eca6461 to udc-d1-release

Change-Id: I8eae4685923bf4180e66c99489ad79626d68d497