Snap for 9316940 from 331e5d59d4fcb284a512024eae32b6d0245253d4 to udc-release

Change-Id: Ifb9a1741260b14e79fb021836c13b645c5cd57ea