Production hotfix for Android L