Merge with SamsungBCM-GrandNeo (credit this team)