Snap for 9075788 from 964df8918075357c42ce494da436dfe6f02a494e to udc-release

Change-Id: If6cc2a361db1fd2af3639b5201c458efbdbbcf7a