Snap for 9869615 from a8a37a45a3f38004d0714765ba7a57ab5a6d8cda to udc-d1-release

Change-Id: Ic256f9989375ad1728332f2cee55e42a72cd2fe4