Merge changes from apptentive-android repo