Snap for 9722771 from 3306ba060e825286c4631667387b5e1262764a34 to udc-d1-release

Change-Id: I9995eba7de85932fdfc81a7b11d6a6f43682c748