Snap for 9746098 from b10b5ac7a3225f699a7233ca44ecc0826b8e4d43 to udc-d1-release

Change-Id: Icec92556d5d33439424db040fd7049d4b3001000