ReVolt Compatibility

Change-Id: Ide3cbfc86b2befc51ac0390bcb92ddb3aec866cd