Update to work with latest Google Play Services