Snap for 9966400 from f1b6c0d824ead39ebcc1d9dd7fba47dc0435c4d3 to udc-release

Change-Id: I480571d4f4c6f98fbd66bcb2de88855fa77296b1