Snap for 5490630 from bc100eff8b01defc79b3ce29a8d3327b2b55b30b to rvc-release

Change-Id: I1f57bef69bf6afa021067ab57859ebd0fcf328d6