Snap for 9348489 from 34849ea08d4d51331779dd5bbf354d55e0192eb6 to udc-release

Change-Id: I624eee04b1a43ecd3660629961cdd1066f9adc60