Snap for 9754537 from ae325e5f2b0549757cae7eee17e51632c2e24bbb to udc-release

Change-Id: If890a393dd6ad041184b7d7d108a68ffe45d9309