Made changes to support Nexus 6