Snap for 10859301 from 3895dea14d107de8fa7deb5f20f25141385a5576 to udc-qpr1-release

Change-Id: I164de272c904c1cffc3dad8c8512d8c5bd34b352