Snap for 9669569 from 5d7dbd9c0d3fb0518453852b0160f70398a194a6 to udc-d1-release

Change-Id: I7a53bf019fd46bb5e5a22f41a09711ab1262223c