Snap for 9719949 from 8e6fcc19cd531ea9d7dfbcd50b1a72b5c196758e to udc-release

Change-Id: I84eeb92c909d9207e161ee0163ecad6790f9dea3