Checking in second set of changes. Need to remove deprecated AppCompat