Snap for 8961762 from a0ca09c6a5defa34e70125a58d3692699882fd8d to udc-release

Change-Id: Ia28c6d4b0eb9ea8750f1a1bc63ee4795ea9b3be2