Snap for 10360508 from fa28b150644f94a6dd3f79ed210e1cede206e99c to udc-release

Change-Id: I663fbf053acadcb538be1e6a9862737338c6b72f