Made adjustments for Android 17.
