Snap for 6488384 from 4563b3247297054c6e81f19e1b9374030f807527 to rvc-release

Change-Id: I1e332ad4bd47becf17cd38b9e29b537362431912