Snap for 9089009 from b7bb261b8f573f279ffd9c5cc81787b80b483515 to udc-release

Change-Id: If019dcfb0a53af0a20463e833e2f011a08daa5cc