ReVolt Compatibility

Change-Id: Ifde0b759c2af599b20a8ab7082d764ff91d1ff3b