Snap for 9163570 from f00d2017470f97033309286564bb1f1322298162 to udc-release

Change-Id: Ib4ed985bac4b45628d57e61458e8f7d10a835393