Snap for 9884336 from 3dd4d1c150afff72cfd67e41274ede64b78337b0 to udc-d1-release

Change-Id: I3090f3b1f980abe5a6dd219ccdbece4764393fee