Snap for 5999676 from 97d726ee0baeb8a35d9d30b056d9a18c75120aa5 to rvc-release

Change-Id: I2e06158ce4400b6570709b013d53053c2dac47d1