WIP
Upgrade for Android 5.0 Lollipop