Changes due to Android Studio updates