Fixes for Android Studio Upgrade