Changes for Android Studio 1.0.0