Snap for 8401170 from 4af5d8de986f95617f6faa50492a27c052ee0b03 to udc-release

Change-Id: I65321553886b5676c72d3898c3f28f4a0610c284