Snap for 6188643 from bfc3aaf4fa61c4a7970286910fba4bd8474c53c4 to rvc-release

Change-Id: Id629432b25afb9afd57c68b3cd2d5bf6de3f3bdf