Snap for 8340981 from 9a146b85ac5c341b92f5b66da6ea787c2c0555f7 to udc-release

Change-Id: I93795447315635d0fd3e8a2a859b2ceefc452cf4