Snap for 5612230 from f6fec1e8b246ed82065b8534487644188ce39a1c to rvc-release

Change-Id: I58eaaab3a2b80a51fd489c42e2c4357fb463419f