Added compatibility for Android Nougat 7.1