Snap for 5533215 from 4561247d396ceee20fca90ce8224876468d57059 to rvc-release

Change-Id: I2a3b776854c6013fa1b9cf94140ea1a2ccfaf9e4