Snap for 5968874 from 2b0a70deb5487044940089f52a65b5f67b1e7a0a to rvc-release

Change-Id: I0689e3dad485b45c5cf1f0b93f9ad7eabe0503af