Snap for 9722771 from aa378e4983a767ff01e7b0ee2b45d08ea8ae8683 to udc-d1-release

Change-Id: I926cb4e1fe7b47c3434f92ce4bb9a1396970a9c3