Snap for 5969935 from bae8ac976078093791e0350604d05087a0cd05c0 to rvc-release

Change-Id: Ibfdf97b1a347a20d031a61ba88929da0bd7e0843