Snap for 9185739 from 4904e70f9d6e3e8a5cc11a286944324c627fddcf to udc-release

Change-Id: If3aec5cd4879c7e70bab9ecd2ff603a82a59887e