Snap for 6828705 from c206a1323411548fded20ec739e18a9e875be751 to rvc-d1-b-release

Change-Id: Ic0f9c63e7fdcb06d1ff5eb8ef0c1035f7d8e15f2