Snap for 9163570 from a2e2dde96faffc347cf9b60fedbe1911ed379ece to udc-release

Change-Id: Ia9933e17a6c66e1b121a06b9ed0ac02171559f67