ReVolt Compatibility

Change-Id: Id4f868c6a4766dbaaec9ef721ca727d36ef897ec