Snap for 9722771 from 0c6ff6e406624930c4f6dd3afe4db1009288ec15 to udc-d1-release

Change-Id: I9cade1d2c03a47f6740009ae38573387092ef17e