Snap for 10078820 from 2f9fcc4d3c019bc89412ce949abe0f0831f5198b to udc-release

Change-Id: I17dd9fa90a0d17954d138841384a8995f1f8f47a