Snap for 10557896 from 4f2efa7239dd9049d6fe7d2c7b17f3568ba795cb to udc-qpr1-release

Change-Id: Ica2fa1bdc054e427ad3e61908eb47d242a8d9016