Snap for 9274386 from ca3031ed2a306e4dc7f69eff507e7f408735c13d to udc-release

Change-Id: I23b2bc638b4ad93ca4b11e1fa9dfc5c4576c2252