Snap for 10368302 from 7165d7867818582b3566c5048f3f7822c096cd62 to udc-d2-release

Change-Id: Ie6863882f5deff64108a6aae052d0daa035a680a