Genericize more
Upgrading to Android L