Snap for 5900950 from 460184f29a4ae05b516f47c86d88210db2398675 to rvc-release

Change-Id: Ic859f4de5a05aca76eda2014dfed3b8033cfbd0d