Snap for 8788539 from 0422278f01bda1cea8d27ef858d161c605d019b8 to udc-release

Change-Id: Ifca2792bdc8af206d2e45af937251072deb8e059