Snap for 8741820 from 6c548c0576ed11fa54b153ec4aff5d20a90d0b39 to udc-release

Change-Id: I284d8c8496cf0375d6d76d385e82e6fc3bc7872b