Snap for 9867821 from 700516aff7935a45215eb9137f68da8ae0e8e50f to udc-release

Change-Id: I5bca188113b076ccf6c85a2defd48108eefb340d