Snap for 9425524 from bd09e6b205e2a748408f90035542ae09ebd96114 to udc-release

Change-Id: I2363d7eb3a8528d5091cf5b2b735bdd7413f55f0