Snap for 5726925 from 0506b68a4f23e7639c470b075fdf547347bad810 to rvc-release

Change-Id: I726f0308c281b18c8b75c3de336d740eafb576be