Updated for Android R
