Committinf first stage modifications for Android Studio