Added support for Android 5.0 - step 6