Snap for 9719949 from fd8a2f26a4f05ab2022d50f7bc6d60386ec6e732 to udc-release

Change-Id: I269b000f96b481283d7ccb67d8bcfe3f7357c6cf