Snap for 8688936 from 02a152f578b7216f023cf9385ccbe41224217700 to udc-release

Change-Id: If224314d5cc356a54c155880ca346c57ac7dff05