Snap for 6465574 from be152410643eda91a57370b1d7d476babad87e3b to rvc-release

Change-Id: I2aa1b7d38b1802ed2c1e6a2be565514736f54ca8
tree: 49df332359dba120bd564efa0b02898692a44717
  1. 30/