Snap for 10573380 from e9a5808a8f0691d0d921518e78af6fe306557346 to udc-d1-release

Change-Id: I90f61e8eb2c1c6c4a0454fd327a3ba5f412e129b