Snap for 10196304 from d465e33fd61767391af0c9cdd3558447d28e0d92 to udc-release

Change-Id: Ic91557c3eca376d039b5d7f7a77fd6c03a406652