Snap for 5443283 from b28bbfee48f9e91bc8a509d675fb036789ee6a5a to rvc-release

Change-Id: I76a4de88fe3d7d19e232b26def57c402bf76613a