Add missing Lollipop changes
Thanks @Hashcode