Snap for 9296606 from 2c11e0ecf8f1f69c81f29e4c73cf0e1d0aa35c9b to udc-release

Change-Id: I31b3c45c33f78978d0f20b9c25e85f3065b3dfdc