Snap for 9163570 from a29eb594b9f38f1bc4cff3cde27ea97f90c9beb8 to udc-release

Change-Id: If004f222dde7d381aee2b5892e855a5dae95d8c4