Snap for 9853495 from ff5e174ef6075d20cb95e89c944da21c83ac15cd to udc-release

Change-Id: Ib2848a82aa00247b62217509df2d876db555b4a7