Changes from upgrading to Android Studio 1.0 and fixed trigger step button