Add back support for Nexus devices