Final commit before Android Studio conversion.