Snap for 5575726 from 2e452f7d4d33963a5c75bdd7e7c23118cb80246d to rvc-release

Change-Id: I113592f79d1e2337c31fd4b3bfd54d72c9559729