Snap for 6639787 from ab2041d601fcbdfaebf2893d07c1b68371de4898 to rvc-release

Change-Id: Ib6838b7b26de1cb1cb78ec1f133c376ea4d8b92c