From d9e86d960d46e1be1f343591d7f37967b9ce8f3b Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 13 Jun 2017 00:30:41 +0200
Subject: [PATCH] Increase version code, update sublib and copyright header

---
 extern/GmsApi                                                   | 2 +-
 extern/GmsLib                                                   | 2 +-
 extern/RemoteDroidGuard                                         | 2 +-
 extern/UnifiedNlp                                               | 2 +-
 play-services-core/build.gradle                                 | 2 +-
 play-services-core/src/main/AndroidManifest.xml                 | 2 +-
 .../src/main/java/com/google/android/gms/ads/AdActivity.java    | 2 +-
 .../java/com/google/android/gms/ads/AdManagerCreatorImpl.java   | 2 +-
 .../google/android/gms/analytics/service/AnalyticsService.java  | 2 +-
 .../java/com/google/android/gms/auth/FirebaseAuthService.java   | 2 +-
 .../src/main/java/com/google/android/gms/auth/GetToken.java     | 2 +-
 .../main/java/com/google/android/gms/auth/TokenActivity.java    | 2 +-
 .../gms/cast/framework/internal/CastDynamiteModuleImpl.java     | 2 +-
 .../android/gms/chimera/container/DynamiteLoaderImpl.java       | 2 +-
 .../android/gms/common/security/ProviderInstallerImpl.java      | 2 +-
 .../google/android/gms/common/ui/SignInButtonCreatorImpl.java   | 2 +-
 .../google/android/gms/firebase_database/ModuleDescriptor.java  | 2 +-
 .../java/com/google/android/gms/gcm/http/GoogleHttpService.java | 2 +-
 .../java/com/google/android/gms/maps/internal/CreatorImpl.java  | 2 +-
 .../android/gms/plus/plusone/PlusOneButtonCreatorImpl.java      | 2 +-
 .../java/com/google/android/gms/recovery/RecoveryService.java   | 2 +-
 .../android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java  | 2 +-
 .../database/connection/idl/IPersistentConnectionImpl.java      | 2 +-
 .../src/main/java/org/microg/gms/AbstractGmsServiceBroker.java  | 2 +-
 .../src/main/java/org/microg/gms/BaseService.java               | 2 +-
 .../src/main/java/org/microg/gms/DummyService.java              | 2 +-
 .../src/main/java/org/microg/gms/ads/AdvertisingIdService.java  | 2 +-
 .../main/java/org/microg/gms/ads/AdvertisingIdServiceImpl.java  | 2 +-
 .../src/main/java/org/microg/gms/ads/GService.java              | 2 +-
 .../main/java/org/microg/gms/auth/AccountContentProvider.java   | 2 +-
 .../main/java/org/microg/gms/auth/AskPermissionActivity.java    | 2 +-
 .../src/main/java/org/microg/gms/auth/AuthManager.java          | 2 +-
 .../main/java/org/microg/gms/auth/AuthManagerServiceImpl.java   | 2 +-
 .../src/main/java/org/microg/gms/auth/AuthRequest.java          | 2 +-
 .../src/main/java/org/microg/gms/auth/AuthResponse.java         | 2 +-
 .../src/main/java/org/microg/gms/auth/SignInService.java        | 2 +-
 .../org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java   | 2 +-
 .../main/java/org/microg/gms/auth/login/AssistantActivity.java  | 2 +-
 .../src/main/java/org/microg/gms/auth/login/LoginActivity.java  | 2 +-
 .../org/microg/gms/auth/loginservice/AccountAuthenticator.java  | 2 +-
 .../org/microg/gms/auth/loginservice/GoogleLoginService.java    | 2 +-
 .../src/main/java/org/microg/gms/car/CarService.java            | 2 +-
 .../src/main/java/org/microg/gms/checkin/CheckinClient.java     | 2 +-
 .../src/main/java/org/microg/gms/checkin/CheckinManager.java    | 2 +-
 .../src/main/java/org/microg/gms/checkin/CheckinService.java    | 2 +-
 .../src/main/java/org/microg/gms/checkin/LastCheckinInfo.java   | 2 +-
 .../src/main/java/org/microg/gms/checkin/TriggerReceiver.java   | 2 +-
 .../java/org/microg/gms/clearcut/ClearcutLoggerService.java     | 2 +-
 .../java/org/microg/gms/clearcut/ClearcutLoggerServiceImpl.java | 2 +-
 .../src/main/java/org/microg/gms/common/Build.java              | 2 +-
 .../main/java/org/microg/gms/common/DeviceConfiguration.java    | 2 +-
 .../src/main/java/org/microg/gms/common/DeviceIdentifier.java   | 2 +-
 .../src/main/java/org/microg/gms/common/HttpFormClient.java     | 2 +-
 .../src/main/java/org/microg/gms/common/MultiListenerProxy.java | 2 +-
 .../src/main/java/org/microg/gms/common/NonCancelToken.java     | 2 +-
 .../src/main/java/org/microg/gms/common/PhoneInfo.java          | 2 +-
 .../main/java/org/microg/gms/common/RemoteListenerProxy.java    | 2 +-
 .../src/main/java/org/microg/gms/common/Utils.java              | 2 +-
 .../src/main/java/org/microg/gms/drive/api/DriveApiService.java | 2 +-
 .../main/java/org/microg/gms/drive/api/DriveServiceImpl.java    | 2 +-
 .../main/java/org/microg/gms/droidguard/DroidGuardService.java  | 2 +-
 .../src/main/java/org/microg/gms/feedback/FeedbackService.java  | 2 +-
 .../main/java/org/microg/gms/feeds/SubscribedFeedsProvider.java | 2 +-
 .../src/main/java/org/microg/gms/games/GamesStubService.java    | 2 +-
 .../src/main/java/org/microg/gms/games/UpgradeActivity.java     | 2 +-
 .../src/main/java/org/microg/gms/gcm/GcmDatabase.java           | 2 +-
 .../src/main/java/org/microg/gms/gcm/GcmLegacyData.java         | 2 +-
 .../src/main/java/org/microg/gms/gcm/GcmPrefs.java              | 2 +-
 .../src/main/java/org/microg/gms/gcm/McsConstants.java          | 2 +-
 .../src/main/java/org/microg/gms/gcm/McsInputStream.java        | 2 +-
 .../src/main/java/org/microg/gms/gcm/McsOutputStream.java       | 2 +-
 .../src/main/java/org/microg/gms/gcm/McsService.java            | 2 +-
 .../src/main/java/org/microg/gms/gcm/PushRegisterService.java   | 2 +-
 .../src/main/java/org/microg/gms/gcm/RegisterRequest.java       | 2 +-
 .../src/main/java/org/microg/gms/gcm/RegisterResponse.java      | 2 +-
 .../src/main/java/org/microg/gms/gcm/SendReceiver.java          | 2 +-
 .../src/main/java/org/microg/gms/gcm/TriggerReceiver.java       | 2 +-
 .../src/main/java/org/microg/gms/gservices/DatabaseHelper.java  | 2 +-
 .../src/main/java/org/microg/gms/gservices/GServices.java       | 2 +-
 .../main/java/org/microg/gms/gservices/GServicesProvider.java   | 2 +-
 .../src/main/java/org/microg/gms/icing/AppDataSearchImpl.java   | 2 +-
 .../main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java   | 2 +-
 .../src/main/java/org/microg/gms/icing/IndexService.java        | 2 +-
 .../java/org/microg/gms/icing/LightweightAppDataSearchImpl.java | 2 +-
 .../main/java/org/microg/gms/icing/LightweightIndexService.java | 2 +-
 .../src/main/java/org/microg/gms/icing/SearchCorporaImpl.java   | 2 +-
 .../src/main/java/org/microg/gms/icing/SearchQueriesImpl.java   | 2 +-
 .../java/org/microg/gms/location/GoogleLocationManager.java     | 2 +-
 .../org/microg/gms/location/GoogleLocationManagerService.java   | 2 +-
 .../microg/gms/location/GoogleLocationManagerServiceImpl.java   | 2 +-
 .../java/org/microg/gms/location/LocationChangeListener.java    | 2 +-
 .../java/org/microg/gms/location/LocationRequestHelper.java     | 2 +-
 .../main/java/org/microg/gms/location/MockLocationProvider.java | 2 +-
 .../main/java/org/microg/gms/location/RealLocationProvider.java | 2 +-
 .../java/org/microg/gms/location/ReportingAndroidService.java   | 2 +-
 .../main/java/org/microg/gms/location/ReportingServiceImpl.java | 2 +-
 .../java/org/microg/gms/maps/ApplicationContextWrapper.java     | 2 +-
 .../src/main/java/org/microg/gms/maps/BackendMap.java           | 2 +-
 .../src/main/java/org/microg/gms/maps/BackendMapView.java       | 2 +-
 .../src/main/java/org/microg/gms/maps/ContainerLayout.java      | 2 +-
 .../src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java    | 2 +-
 .../src/main/java/org/microg/gms/maps/GoogleMapImpl.java        | 2 +-
 .../src/main/java/org/microg/gms/maps/MapFragmentImpl.java      | 2 +-
 .../src/main/java/org/microg/gms/maps/MapViewImpl.java          | 2 +-
 .../src/main/java/org/microg/gms/maps/ProjectionImpl.java       | 2 +-
 .../src/main/java/org/microg/gms/maps/ResourcesContainer.java   | 2 +-
 .../src/main/java/org/microg/gms/maps/UiSettingsImpl.java       | 2 +-
 .../org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java    | 2 +-
 .../java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java  | 2 +-
 .../java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java | 2 +-
 .../org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java | 2 +-
 .../java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java   | 2 +-
 .../org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java     | 2 +-
 .../java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java   | 2 +-
 .../java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java   | 2 +-
 .../org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java    | 2 +-
 .../src/main/java/org/microg/gms/maps/camera/CameraUpdate.java  | 2 +-
 .../org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java     | 2 +-
 .../org/microg/gms/maps/camera/MapPositionCameraUpdate.java     | 2 +-
 .../main/java/org/microg/gms/maps/camera/NoCameraUpdate.java    | 2 +-
 .../src/main/java/org/microg/gms/maps/data/SharedTileCache.java | 2 +-
 .../main/java/org/microg/gms/maps/data/SharedTileProvider.java  | 2 +-
 .../src/main/java/org/microg/gms/maps/markup/CircleImpl.java    | 2 +-
 .../java/org/microg/gms/maps/markup/ClearableVectorLayer.java   | 2 +-
 .../main/java/org/microg/gms/maps/markup/DrawableMarkup.java    | 2 +-
 .../main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java | 2 +-
 .../src/main/java/org/microg/gms/maps/markup/InfoWindow.java    | 2 +-
 .../src/main/java/org/microg/gms/maps/markup/MarkerImpl.java    | 2 +-
 .../main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java  | 2 +-
 .../src/main/java/org/microg/gms/maps/markup/Markup.java        | 2 +-
 .../src/main/java/org/microg/gms/maps/markup/PolygonImpl.java   | 2 +-
 .../src/main/java/org/microg/gms/maps/markup/PolylineImpl.java  | 2 +-
 .../main/java/org/microg/gms/maps/markup/TileOverlayImpl.java   | 2 +-
 .../src/main/java/org/microg/gms/mdm/NetworkQualityService.java | 2 +-
 .../src/main/java/org/microg/gms/people/DatabaseHelper.java     | 2 +-
 .../src/main/java/org/microg/gms/people/PeopleManager.java      | 2 +-
 .../src/main/java/org/microg/gms/people/PeopleService.java      | 2 +-
 .../src/main/java/org/microg/gms/people/PeopleServiceImpl.java  | 2 +-
 .../src/main/java/org/microg/gms/places/GeoDataService.java     | 2 +-
 .../main/java/org/microg/gms/places/PlaceDetectionService.java  | 2 +-
 .../java/org/microg/gms/places/PlaceDetectionServiceImpl.java   | 2 +-
 .../src/main/java/org/microg/gms/places/PlacesServiceImpl.java  | 2 +-
 .../src/main/java/org/microg/gms/playlog/PlayLogService.java    | 2 +-
 .../main/java/org/microg/gms/playlog/PlayLogServiceImpl.java    | 2 +-
 .../src/main/java/org/microg/gms/plus/PlusOneButtonImpl.java    | 2 +-
 .../main/java/org/microg/gms/reminders/RemindersService.java    | 2 +-
 .../java/org/microg/gms/reminders/RemindersServiceImpl.java     | 2 +-
 .../java/org/microg/gms/settings/GoogleSettingsProvider.java    | 2 +-
 .../src/main/java/org/microg/gms/snet/Attestation.java          | 2 +-
 .../main/java/org/microg/gms/snet/SafetyNetClientService.java   | 2 +-
 .../java/org/microg/gms/snet/SafetyNetClientServiceImpl.java    | 2 +-
 .../src/main/java/org/microg/gms/ui/AboutFragment.java          | 2 +-
 .../main/java/org/microg/gms/ui/AccountSettingsActivity.java    | 2 +-
 .../src/main/java/org/microg/gms/ui/Conditions.java             | 2 +-
 .../src/main/java/org/microg/gms/ui/GcmFragment.java            | 2 +-
 .../main/java/org/microg/gms/ui/LocationSettingsActivity.java   | 2 +-
 .../src/main/java/org/microg/gms/ui/PlacePickerActivity.java    | 2 +-
 .../src/main/java/org/microg/gms/ui/SelfCheckFragment.java      | 2 +-
 .../src/main/java/org/microg/gms/ui/SettingsActivity.java       | 2 +-
 .../src/main/java/org/microg/gms/wallet/OwServiceImpl.java      | 2 +-
 .../src/main/java/org/microg/gms/wallet/PaymentService.java     | 2 +-
 .../java/org/microg/gms/wearable/ClockworkNodePreferences.java  | 2 +-
 .../org/microg/gms/wearable/ConfigurationDatabaseHelper.java    | 2 +-
 .../src/main/java/org/microg/gms/wearable/DataItemInternal.java | 2 +-
 .../src/main/java/org/microg/gms/wearable/DataItemRecord.java   | 2 +-
 .../src/main/java/org/microg/gms/wearable/MessageHandler.java   | 2 +-
 .../main/java/org/microg/gms/wearable/NodeDatabaseHelper.java   | 2 +-
 .../src/main/java/org/microg/gms/wearable/RpcHelper.java        | 2 +-
 .../src/main/java/org/microg/gms/wearable/WearableImpl.java     | 2 +-
 .../src/main/java/org/microg/gms/wearable/WearableService.java  | 2 +-
 .../main/java/org/microg/gms/wearable/WearableServiceImpl.java  | 2 +-
 .../microg/gms/wearable/location/WearableLocationService.java   | 2 +-
 .../src/main/java/org/microg/tools/AccountPickerActivity.java   | 2 +-
 .../org/microg/tools/selfcheck/InstalledPackagesChecks.java     | 2 +-
 .../org/microg/tools/selfcheck/RomSpoofSignatureChecks.java     | 2 +-
 .../src/main/java/org/microg/tools/selfcheck/SystemChecks.java  | 2 +-
 .../src/main/res/drawable/circle_shape_background.xml           | 2 +-
 play-services-core/src/main/res/drawable/ic_plusone_medium.xml  | 2 +-
 play-services-core/src/main/res/drawable/ic_plusone_small.xml   | 2 +-
 .../src/main/res/drawable/ic_plusone_standard.xml               | 2 +-
 play-services-core/src/main/res/drawable/ic_plusone_tall.xml    | 2 +-
 play-services-core/src/main/res/layout/ask_permission.xml       | 2 +-
 .../src/main/res/layout/ask_permission_list_entry.xml           | 2 +-
 play-services-core/src/main/res/layout/games_info.xml           | 2 +-
 play-services-core/src/main/res/layout/list_no_item.xml         | 2 +-
 play-services-core/src/main/res/layout/login_assistant.xml      | 2 +-
 .../src/main/res/layout/login_assistant_loading.xml             | 2 +-
 play-services-core/src/main/res/layout/pick_place.xml           | 2 +-
 play-services-core/src/main/res/menu/pick_place.xml             | 2 +-
 play-services-core/src/main/res/values-de/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-de/strings.xml           | 2 +-
 play-services-core/src/main/res/values-eo/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-eo/strings.xml           | 2 +-
 play-services-core/src/main/res/values-es/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-es/strings.xml           | 2 +-
 play-services-core/src/main/res/values-fr/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-fr/strings.xml           | 2 +-
 play-services-core/src/main/res/values-pl/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-pl/strings.xml           | 2 +-
 play-services-core/src/main/res/values-pt-rBR/strings.xml       | 2 +-
 play-services-core/src/main/res/values-ro/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-ro/strings.xml           | 2 +-
 play-services-core/src/main/res/values-ru/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-ru/strings.xml           | 2 +-
 play-services-core/src/main/res/values-sr/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-sr/strings.xml           | 2 +-
 play-services-core/src/main/res/values-uk/permissions.xml       | 2 +-
 play-services-core/src/main/res/values-uk/strings.xml           | 2 +-
 play-services-core/src/main/res/values-zh-rTW/permissions.xml   | 2 +-
 play-services-core/src/main/res/values-zh-rTW/strings.xml       | 2 +-
 play-services-core/src/main/res/values/arrays.xml               | 2 +-
 play-services-core/src/main/res/values/bools.xml                | 2 +-
 play-services-core/src/main/res/values/colors.xml               | 2 +-
 play-services-core/src/main/res/values/dimens.xml               | 2 +-
 play-services-core/src/main/res/values/permissions.xml          | 2 +-
 play-services-core/src/main/res/values/signature.xml            | 2 +-
 play-services-core/src/main/res/values/strings.xml              | 2 +-
 play-services-core/src/main/res/values/themes.xml               | 2 +-
 play-services-core/src/main/res/xml/authenticator.xml           | 2 +-
 play-services-core/src/main/res/xml/preferences_account.xml     | 2 +-
 play-services-core/src/main/res/xml/preferences_auth.xml        | 2 +-
 play-services-core/src/main/res/xml/preferences_gcm.xml         | 2 +-
 .../src/main/res/xml/preferences_gcm_advanced.xml               | 2 +-
 play-services-core/src/main/res/xml/preferences_start.xml       | 2 +-
 224 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/extern/GmsApi b/extern/GmsApi
index d47ab8f2..b25ca172 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit d47ab8f248dd782a9f554cc007f41e97f79be680
+Subproject commit b25ca17225de59fef635f1b9d6ba3abc1144e17a
diff --git a/extern/GmsLib b/extern/GmsLib
index b71d6ceb..8b581314 160000
--- a/extern/GmsLib
+++ b/extern/GmsLib
@@ -1 +1 @@
-Subproject commit b71d6ceb7e81b7df32147651a6b0db9be2733197
+Subproject commit 8b5813143ed11fbcb533d407ce58fb32a54fe18a
diff --git a/extern/RemoteDroidGuard b/extern/RemoteDroidGuard
index 0ca6fb22..8eabc788 160000
--- a/extern/RemoteDroidGuard
+++ b/extern/RemoteDroidGuard
@@ -1 +1 @@
-Subproject commit 0ca6fb22650bb3e0d2fe1440f45e62a4acca2e19
+Subproject commit 8eabc788fda79ac986f09721afbeea53612096b7
diff --git a/extern/UnifiedNlp b/extern/UnifiedNlp
index 1613778a..bf8682e0 160000
--- a/extern/UnifiedNlp
+++ b/extern/UnifiedNlp
@@ -1 +1 @@
-Subproject commit 1613778a5e075ca2a15acfd86aee102a9df83bd9
+Subproject commit bf8682e00fa829d3c6041a3646afce9a264696da
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index e65a7ef3..b00966b7 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -62,7 +62,7 @@ android {
         versionName getMyVersionName()
         def x = getMyVersionCode()
         // We are not allowed to freely choose the hundreds column as it defines the device type
-        versionCode(10542400 + x % 100 + ((int) (x / 100)) * 1000)
+        versionCode(11056400 + x % 100 + ((int) (x / 100)) * 1000)
 
         minSdkVersion androidMinSdk()
         targetSdkVersion androidTargetSdk()
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index acda90f4..cdb97333 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/ads/AdActivity.java b/play-services-core/src/main/java/com/google/android/gms/ads/AdActivity.java
index 2d39c1ae..3829065d 100644
--- a/play-services-core/src/main/java/com/google/android/gms/ads/AdActivity.java
+++ b/play-services-core/src/main/java/com/google/android/gms/ads/AdActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/ads/AdManagerCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/ads/AdManagerCreatorImpl.java
index 88dd652e..f0f6a9a5 100644
--- a/play-services-core/src/main/java/com/google/android/gms/ads/AdManagerCreatorImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/ads/AdManagerCreatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/analytics/service/AnalyticsService.java b/play-services-core/src/main/java/com/google/android/gms/analytics/service/AnalyticsService.java
index 417b981a..5cb38bc2 100644
--- a/play-services-core/src/main/java/com/google/android/gms/analytics/service/AnalyticsService.java
+++ b/play-services-core/src/main/java/com/google/android/gms/analytics/service/AnalyticsService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java b/play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java
index d79322fd..0ffac47d 100644
--- a/play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java
+++ b/play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/auth/GetToken.java b/play-services-core/src/main/java/com/google/android/gms/auth/GetToken.java
index 2aa1f7a6..b5722f9b 100644
--- a/play-services-core/src/main/java/com/google/android/gms/auth/GetToken.java
+++ b/play-services-core/src/main/java/com/google/android/gms/auth/GetToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/auth/TokenActivity.java b/play-services-core/src/main/java/com/google/android/gms/auth/TokenActivity.java
index fd9df758..3e59217e 100644
--- a/play-services-core/src/main/java/com/google/android/gms/auth/TokenActivity.java
+++ b/play-services-core/src/main/java/com/google/android/gms/auth/TokenActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java
index 94ace555..b5770fee 100644
--- a/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/cast/framework/internal/CastDynamiteModuleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java
index d14baaf6..5a8a2c50 100644
--- a/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteLoaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java b/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java
index e855153c..cc4509dc 100644
--- a/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java
index 855d34a4..0826b131 100644
--- a/play-services-core/src/main/java/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java b/play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java
index 992edbaf..8f1043a4 100644
--- a/play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java
+++ b/play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/gcm/http/GoogleHttpService.java b/play-services-core/src/main/java/com/google/android/gms/gcm/http/GoogleHttpService.java
index 78bc93eb..2ff141af 100644
--- a/play-services-core/src/main/java/com/google/android/gms/gcm/http/GoogleHttpService.java
+++ b/play-services-core/src/main/java/com/google/android/gms/gcm/http/GoogleHttpService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
index 215192ff..dabe6a9d 100644
--- a/play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java
index db6fb076..ddd04bea 100644
--- a/play-services-core/src/main/java/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java b/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java
index d7f4d003..c330e43e 100644
--- a/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java
+++ b/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java
index 85ab12d6..26343597 100644
--- a/play-services-core/src/main/java/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java
+++ b/play-services-core/src/main/java/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java b/play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java
index d9215ab0..a8efde6e 100644
--- a/play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java
+++ b/play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java b/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
index 3fdd2b59..255cd967 100644
--- a/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
+++ b/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/BaseService.java b/play-services-core/src/main/java/org/microg/gms/BaseService.java
index 9ec3a902..792aa151 100644
--- a/play-services-core/src/main/java/org/microg/gms/BaseService.java
+++ b/play-services-core/src/main/java/org/microg/gms/BaseService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/DummyService.java b/play-services-core/src/main/java/org/microg/gms/DummyService.java
index b4a6f87e..3fb2749a 100644
--- a/play-services-core/src/main/java/org/microg/gms/DummyService.java
+++ b/play-services-core/src/main/java/org/microg/gms/DummyService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdService.java b/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdService.java
index b0d4ee8a..c3bc63d1 100644
--- a/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdService.java
+++ b/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdServiceImpl.java
index 9768f5c1..30760da9 100644
--- a/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/ads/AdvertisingIdServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ads/GService.java b/play-services-core/src/main/java/org/microg/gms/ads/GService.java
index 77f934f0..c8239da3 100644
--- a/play-services-core/src/main/java/org/microg/gms/ads/GService.java
+++ b/play-services-core/src/main/java/org/microg/gms/ads/GService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java b/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java
index ebaa12d6..5d41d97f 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AccountContentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java
index 3babbb26..a8df5f16 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
index 2879f301..63c2265c 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java
index 0b3b74ff..18e13178 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java
index a3e1e9da..c29e8e8d 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java
index af585964..f94eacef 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/SignInService.java b/play-services-core/src/main/java/org/microg/gms/auth/SignInService.java
index 46fcc722..8bbcbb80 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/SignInService.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/SignInService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java
index 27ce0ea0..e7693e39 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java
index 66e789a9..0b58b602 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
index 9c39f030..3b3cdb69 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java
index 15d8399a..a7f34291 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java
index 83739702..086c0612 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/car/CarService.java b/play-services-core/src/main/java/org/microg/gms/car/CarService.java
index 77492892..bd412b6c 100644
--- a/play-services-core/src/main/java/org/microg/gms/car/CarService.java
+++ b/play-services-core/src/main/java/org/microg/gms/car/CarService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
index c1720970..602f6fe8 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java
index 52d12109..4b67bdd5 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
index 34f2199d..9fc69307 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/LastCheckinInfo.java b/play-services-core/src/main/java/org/microg/gms/checkin/LastCheckinInfo.java
index 113f6b1c..4cdfd88c 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/LastCheckinInfo.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/LastCheckinInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java b/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java
index 7837484f..fbb8aaca 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerService.java b/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerService.java
index f636bace..02203153 100644
--- a/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerService.java
+++ b/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerServiceImpl.java
index b191d756..05361e81 100644
--- a/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/clearcut/ClearcutLoggerServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/Build.java b/play-services-core/src/main/java/org/microg/gms/common/Build.java
index 6dc101bd..532a6845 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/Build.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/Build.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java
index f1087f9c..411de8aa 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java
index 5a50e5e8..bc718020 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java b/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
index 879d11fb..e91c27ca 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java b/play-services-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java
index 0e0baa04..bde71702 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java b/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java
index ff97664f..29cdba34 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java b/play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java
index 32ed2bbb..1fbc4bf9 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java b/play-services-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java
index 0bfbee6b..1e2fa5ea 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/common/Utils.java b/play-services-core/src/main/java/org/microg/gms/common/Utils.java
index f180fff8..48b7fbd1 100644
--- a/play-services-core/src/main/java/org/microg/gms/common/Utils.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/drive/api/DriveApiService.java b/play-services-core/src/main/java/org/microg/gms/drive/api/DriveApiService.java
index b2b2ae2f..2fc066e1 100644
--- a/play-services-core/src/main/java/org/microg/gms/drive/api/DriveApiService.java
+++ b/play-services-core/src/main/java/org/microg/gms/drive/api/DriveApiService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/drive/api/DriveServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/drive/api/DriveServiceImpl.java
index 5cdaf305..4a899fa9 100644
--- a/play-services-core/src/main/java/org/microg/gms/drive/api/DriveServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/drive/api/DriveServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java b/play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java
index 3e6a5023..7760862d 100644
--- a/play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java
+++ b/play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/feedback/FeedbackService.java b/play-services-core/src/main/java/org/microg/gms/feedback/FeedbackService.java
index 574dcc7a..403240ae 100644
--- a/play-services-core/src/main/java/org/microg/gms/feedback/FeedbackService.java
+++ b/play-services-core/src/main/java/org/microg/gms/feedback/FeedbackService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/feeds/SubscribedFeedsProvider.java b/play-services-core/src/main/java/org/microg/gms/feeds/SubscribedFeedsProvider.java
index 4bd79255..58ca9eee 100644
--- a/play-services-core/src/main/java/org/microg/gms/feeds/SubscribedFeedsProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/feeds/SubscribedFeedsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/games/GamesStubService.java b/play-services-core/src/main/java/org/microg/gms/games/GamesStubService.java
index 3cb6176f..8a881387 100644
--- a/play-services-core/src/main/java/org/microg/gms/games/GamesStubService.java
+++ b/play-services-core/src/main/java/org/microg/gms/games/GamesStubService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java b/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java
index ca4b5db9..7b2709a4 100644
--- a/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/games/UpgradeActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmDatabase.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmDatabase.java
index cea5ccb7..3dd67b53 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmDatabase.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmLegacyData.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmLegacyData.java
index 6ede2884..cab9652a 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmLegacyData.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmLegacyData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java
index a0e47a05..5a3084f0 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsConstants.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsConstants.java
index aac34ad9..300dac0c 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/McsConstants.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java
index 0001be6c..571c6502 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java
index e7626c6b..67b26047 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
index 96a9fa68..6d64ec89 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java b/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java
index 72d115b7..5e971914 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java
index ed3d0fb0..183dc0fb 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java
index cce466e9..6d35560c 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java b/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java
index c37f7c2e..f49f53e2 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/SendReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java b/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java
index 9828c2be..1a7bdb8b 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/TriggerReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java b/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java
index 5e02cad5..9aa1ee4b 100644
--- a/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java
+++ b/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java
index f3aae2b9..66595b26 100644
--- a/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java
+++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
index 7abdbaaf..0dc21d30 100644
--- a/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java
index 14d0689a..9340def3 100644
--- a/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java
index f5591b79..e3aaf3e2 100644
--- a/play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java b/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java
index bf3a15e7..6401e6ab 100644
--- a/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java
+++ b/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java
index d8eff058..554d86a4 100644
--- a/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java b/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java
index 159f0a6c..2715c6ba 100644
--- a/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java
+++ b/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java
index 15725de1..fa61dedb 100644
--- a/play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java
index 705aeb65..2c353ab7 100644
--- a/play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java
index d394a1ce..eb4fd291 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java
index 344e8456..1a105150 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java
index aff4873f..cdd4c75f 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/LocationChangeListener.java b/play-services-core/src/main/java/org/microg/gms/location/LocationChangeListener.java
index 6c0aadd8..f574746d 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/LocationChangeListener.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/LocationChangeListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java b/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java
index 0dd9d1d7..a143e2db 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java b/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java
index fe3ce0a8..bdeb7318 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java b/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java
index c61ef059..50d34621 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/ReportingAndroidService.java b/play-services-core/src/main/java/org/microg/gms/location/ReportingAndroidService.java
index b48b46ee..d382cdcc 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/ReportingAndroidService.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/ReportingAndroidService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/location/ReportingServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/location/ReportingServiceImpl.java
index 9dbd5e34..c091cbde 100644
--- a/play-services-core/src/main/java/org/microg/gms/location/ReportingServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/location/ReportingServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java b/play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java
index ebad90df..a00e4649 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java b/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java
index 14e3725d..fa60f85d 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java b/play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java
index d7329456..45c31e1f 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java b/play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java
index 772aa7f2..42bc1ede 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java b/play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java
index af23f604..ea5293b4 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java
index 060ed7ea..6bd46bf0 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java
index 49a07c16..552a32a1 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java
index 34383542..ba6388a5 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java
index a214a2d0..5ad86376 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java b/play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java
index 827318eb..23acdd6d 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java
index 6d85649b..39f366ee 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java
index 3bf34478..5be12759 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java
index e85f31ed..426a3d8e 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java
index af8fc9ec..0569840a 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java
index f7bba59d..7ea17439 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java
index c69a3ac3..177017d4 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java
index bccd4545..4cd8bcd0 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java
index 1e7d946f..b7019e03 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java
index 4be4decb..9c0ccfbf 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java
index cb90e475..f33fda5d 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java
index c199249f..70cd3d68 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java
index 2fe1afeb..4b00dffd 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java
index acc0a285..57fa464a 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java
index 3120278f..17cb73eb 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java b/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java
index 9bcd8f9e..b5ccff98 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java b/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java
index 4c22f078..d519dea9 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java
index 817e505a..5d376f3a 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java
index de36cdc3..aed3b183 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java
index 12d151bc..5397f1db 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java
index 24fadf40..1d01834e 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java
index db94909c..c719ef9f 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java
index ad871526..6b3483aa 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java
index 8df23aff..29df161e 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java
index f783e2f3..b7958fa9 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java
index cec8810f..35009fb5 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java
index 1ffeb4fe..756bb1c5 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java
index 55410044..ebaaa86c 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java b/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java
index f7fd70ef..b999101b 100644
--- a/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java
+++ b/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/people/DatabaseHelper.java b/play-services-core/src/main/java/org/microg/gms/people/DatabaseHelper.java
index 033e4e15..29527e38 100644
--- a/play-services-core/src/main/java/org/microg/gms/people/DatabaseHelper.java
+++ b/play-services-core/src/main/java/org/microg/gms/people/DatabaseHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java
index c33afec8..b9511e06 100644
--- a/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/people/PeopleService.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleService.java
index fdb16af0..03f03b17 100644
--- a/play-services-core/src/main/java/org/microg/gms/people/PeopleService.java
+++ b/play-services-core/src/main/java/org/microg/gms/people/PeopleService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
index dfef8ebf..9d9af368 100644
--- a/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/places/GeoDataService.java b/play-services-core/src/main/java/org/microg/gms/places/GeoDataService.java
index 716843e5..43a6a84d 100644
--- a/play-services-core/src/main/java/org/microg/gms/places/GeoDataService.java
+++ b/play-services-core/src/main/java/org/microg/gms/places/GeoDataService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionService.java b/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionService.java
index c5977902..761d5a9f 100644
--- a/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionService.java
+++ b/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionServiceImpl.java
index 34d3e5cb..e1c22a27 100644
--- a/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/places/PlaceDetectionServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/places/PlacesServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/places/PlacesServiceImpl.java
index d77128be..c417ac42 100644
--- a/play-services-core/src/main/java/org/microg/gms/places/PlacesServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/places/PlacesServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogService.java b/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogService.java
index 9b4ac260..28015345 100644
--- a/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogService.java
+++ b/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java
index 850c3863..ddf82e44 100644
--- a/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/playlog/PlayLogServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/plus/PlusOneButtonImpl.java b/play-services-core/src/main/java/org/microg/gms/plus/PlusOneButtonImpl.java
index aeb0db78..9b2df0d7 100644
--- a/play-services-core/src/main/java/org/microg/gms/plus/PlusOneButtonImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/plus/PlusOneButtonImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/reminders/RemindersService.java b/play-services-core/src/main/java/org/microg/gms/reminders/RemindersService.java
index d173ce9a..165ceb35 100644
--- a/play-services-core/src/main/java/org/microg/gms/reminders/RemindersService.java
+++ b/play-services-core/src/main/java/org/microg/gms/reminders/RemindersService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/reminders/RemindersServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/reminders/RemindersServiceImpl.java
index 7d3f9409..aacd5e54 100644
--- a/play-services-core/src/main/java/org/microg/gms/reminders/RemindersServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/reminders/RemindersServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java b/play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java
index 39e7fd7e..da3e5094 100644
--- a/play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java
+++ b/play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java b/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java
index 916cd456..0b539368 100644
--- a/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java
+++ b/play-services-core/src/main/java/org/microg/gms/snet/Attestation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientService.java b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientService.java
index 5b190396..893ba303 100644
--- a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientService.java
+++ b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientServiceImpl.java
index cd4efb69..c7bbff9a 100644
--- a/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/snet/SafetyNetClientServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
index 80b997c6..e74685d8 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java
index e52b7bdf..a0c66f9a 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/AccountSettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java b/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java
index 5a8babde..d894192f 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/Conditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java
index 0f9574b1..423f222c 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/GcmFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java
index ab3bf963..b3da114f 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/LocationSettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
index 0a6d0718..b79f94f4 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SelfCheckFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/SelfCheckFragment.java
index 36b8915f..39399aa7 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/SelfCheckFragment.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/SelfCheckFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
index dd49b2d4..5de7fffe 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/SettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wallet/OwServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/wallet/OwServiceImpl.java
index 7651b47e..ad38eb08 100644
--- a/play-services-core/src/main/java/org/microg/gms/wallet/OwServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/wallet/OwServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wallet/PaymentService.java b/play-services-core/src/main/java/org/microg/gms/wallet/PaymentService.java
index 3b5056f7..e2401def 100644
--- a/play-services-core/src/main/java/org/microg/gms/wallet/PaymentService.java
+++ b/play-services-core/src/main/java/org/microg/gms/wallet/PaymentService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/ClockworkNodePreferences.java b/play-services-core/src/main/java/org/microg/gms/wearable/ClockworkNodePreferences.java
index db439819..d6fc016a 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/ClockworkNodePreferences.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/ClockworkNodePreferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/ConfigurationDatabaseHelper.java b/play-services-core/src/main/java/org/microg/gms/wearable/ConfigurationDatabaseHelper.java
index 14058726..01c8a1a8 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/ConfigurationDatabaseHelper.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/ConfigurationDatabaseHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/DataItemInternal.java b/play-services-core/src/main/java/org/microg/gms/wearable/DataItemInternal.java
index 34723357..678c8ef4 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/DataItemInternal.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/DataItemInternal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/DataItemRecord.java b/play-services-core/src/main/java/org/microg/gms/wearable/DataItemRecord.java
index 8e87053a..06052128 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/DataItemRecord.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/DataItemRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/MessageHandler.java b/play-services-core/src/main/java/org/microg/gms/wearable/MessageHandler.java
index c4c65903..b648b3ae 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/MessageHandler.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/MessageHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/NodeDatabaseHelper.java b/play-services-core/src/main/java/org/microg/gms/wearable/NodeDatabaseHelper.java
index 06615bbf..d0bfe058 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/NodeDatabaseHelper.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/NodeDatabaseHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/RpcHelper.java b/play-services-core/src/main/java/org/microg/gms/wearable/RpcHelper.java
index b3746029..b6a638cd 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/RpcHelper.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/RpcHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/WearableImpl.java b/play-services-core/src/main/java/org/microg/gms/wearable/WearableImpl.java
index f6505d10..76faffe7 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/WearableImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/WearableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/WearableService.java b/play-services-core/src/main/java/org/microg/gms/wearable/WearableService.java
index 6cc1ecbf..9afb8b83 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/WearableService.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/WearableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java
index 87d9b97c..c087f39e 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/WearableServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/gms/wearable/location/WearableLocationService.java b/play-services-core/src/main/java/org/microg/gms/wearable/location/WearableLocationService.java
index a4e2a0d1..2757f0db 100644
--- a/play-services-core/src/main/java/org/microg/gms/wearable/location/WearableLocationService.java
+++ b/play-services-core/src/main/java/org/microg/gms/wearable/location/WearableLocationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/tools/AccountPickerActivity.java b/play-services-core/src/main/java/org/microg/tools/AccountPickerActivity.java
index 1185a4e3..09fa611a 100644
--- a/play-services-core/src/main/java/org/microg/tools/AccountPickerActivity.java
+++ b/play-services-core/src/main/java/org/microg/tools/AccountPickerActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java
index 339719de..e34d3dd0 100644
--- a/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java
+++ b/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java
index 13d783f8..e5364195 100644
--- a/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java
+++ b/play-services-core/src/main/java/org/microg/tools/selfcheck/RomSpoofSignatureChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java
index c4150ee4..08dbc714 100644
--- a/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java
+++ b/play-services-core/src/main/java/org/microg/tools/selfcheck/SystemChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright (C) 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/drawable/circle_shape_background.xml b/play-services-core/src/main/res/drawable/circle_shape_background.xml
index cf0d0c4d..9cc09263 100644
--- a/play-services-core/src/main/res/drawable/circle_shape_background.xml
+++ b/play-services-core/src/main/res/drawable/circle_shape_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_medium.xml b/play-services-core/src/main/res/drawable/ic_plusone_medium.xml
index 2dbb9c24..f7433017 100644
--- a/play-services-core/src/main/res/drawable/ic_plusone_medium.xml
+++ b/play-services-core/src/main/res/drawable/ic_plusone_medium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_small.xml b/play-services-core/src/main/res/drawable/ic_plusone_small.xml
index 2dbb9c24..f7433017 100644
--- a/play-services-core/src/main/res/drawable/ic_plusone_small.xml
+++ b/play-services-core/src/main/res/drawable/ic_plusone_small.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_standard.xml b/play-services-core/src/main/res/drawable/ic_plusone_standard.xml
index 2dbb9c24..f7433017 100644
--- a/play-services-core/src/main/res/drawable/ic_plusone_standard.xml
+++ b/play-services-core/src/main/res/drawable/ic_plusone_standard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_tall.xml b/play-services-core/src/main/res/drawable/ic_plusone_tall.xml
index 2dbb9c24..f7433017 100644
--- a/play-services-core/src/main/res/drawable/ic_plusone_tall.xml
+++ b/play-services-core/src/main/res/drawable/ic_plusone_tall.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml
index a9cda623..6ef04c35 100644
--- a/play-services-core/src/main/res/layout/ask_permission.xml
+++ b/play-services-core/src/main/res/layout/ask_permission.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/layout/ask_permission_list_entry.xml b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml
index 0ba3b31e..dbc58106 100644
--- a/play-services-core/src/main/res/layout/ask_permission_list_entry.xml
+++ b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/layout/games_info.xml b/play-services-core/src/main/res/layout/games_info.xml
index ee701032..972dc179 100644
--- a/play-services-core/src/main/res/layout/games_info.xml
+++ b/play-services-core/src/main/res/layout/games_info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/layout/list_no_item.xml b/play-services-core/src/main/res/layout/list_no_item.xml
index 6cc475c8..66cde2f5 100644
--- a/play-services-core/src/main/res/layout/list_no_item.xml
+++ b/play-services-core/src/main/res/layout/list_no_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2013 The Android Open Source Project
-  ~ Copyright (C) 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/layout/login_assistant.xml b/play-services-core/src/main/res/layout/login_assistant.xml
index 9d3e6b3c..a85dd5e3 100644
--- a/play-services-core/src/main/res/layout/login_assistant.xml
+++ b/play-services-core/src/main/res/layout/login_assistant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/layout/login_assistant_loading.xml b/play-services-core/src/main/res/layout/login_assistant_loading.xml
index 56f4cb22..697f91a8 100644
--- a/play-services-core/src/main/res/layout/login_assistant_loading.xml
+++ b/play-services-core/src/main/res/layout/login_assistant_loading.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/layout/pick_place.xml b/play-services-core/src/main/res/layout/pick_place.xml
index f8acaa45..56549b4b 100644
--- a/play-services-core/src/main/res/layout/pick_place.xml
+++ b/play-services-core/src/main/res/layout/pick_place.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/menu/pick_place.xml b/play-services-core/src/main/res/menu/pick_place.xml
index 5bdd8f45..52fda1f5 100644
--- a/play-services-core/src/main/res/menu/pick_place.xml
+++ b/play-services-core/src/main/res/menu/pick_place.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-de/permissions.xml b/play-services-core/src/main/res/values-de/permissions.xml
index 047217dd..0292f489 100644
--- a/play-services-core/src/main/res/values-de/permissions.xml
+++ b/play-services-core/src/main/res/values-de/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-de/strings.xml b/play-services-core/src/main/res/values-de/strings.xml
index 33cfdac1..88d84fbc 100644
--- a/play-services-core/src/main/res/values-de/strings.xml
+++ b/play-services-core/src/main/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-eo/permissions.xml b/play-services-core/src/main/res/values-eo/permissions.xml
index 047217dd..0292f489 100644
--- a/play-services-core/src/main/res/values-eo/permissions.xml
+++ b/play-services-core/src/main/res/values-eo/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-eo/strings.xml b/play-services-core/src/main/res/values-eo/strings.xml
index cb3b569b..1060cb69 100644
--- a/play-services-core/src/main/res/values-eo/strings.xml
+++ b/play-services-core/src/main/res/values-eo/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-es/permissions.xml b/play-services-core/src/main/res/values-es/permissions.xml
index 047217dd..0292f489 100644
--- a/play-services-core/src/main/res/values-es/permissions.xml
+++ b/play-services-core/src/main/res/values-es/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-es/strings.xml b/play-services-core/src/main/res/values-es/strings.xml
index 72da8f68..06a78f72 100644
--- a/play-services-core/src/main/res/values-es/strings.xml
+++ b/play-services-core/src/main/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-fr/permissions.xml b/play-services-core/src/main/res/values-fr/permissions.xml
index 0027d9d6..fb6b4efb 100644
--- a/play-services-core/src/main/res/values-fr/permissions.xml
+++ b/play-services-core/src/main/res/values-fr/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml
index ec46f57d..ea2d62a4 100644
--- a/play-services-core/src/main/res/values-fr/strings.xml
+++ b/play-services-core/src/main/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-pl/permissions.xml b/play-services-core/src/main/res/values-pl/permissions.xml
index ab31f3ce..5834db03 100644
--- a/play-services-core/src/main/res/values-pl/permissions.xml
+++ b/play-services-core/src/main/res/values-pl/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-pl/strings.xml b/play-services-core/src/main/res/values-pl/strings.xml
index 3bbf0139..05bbeb1f 100644
--- a/play-services-core/src/main/res/values-pl/strings.xml
+++ b/play-services-core/src/main/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml
index fc5a3adb..31f62feb 100644
--- a/play-services-core/src/main/res/values-pt-rBR/strings.xml
+++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-ro/permissions.xml b/play-services-core/src/main/res/values-ro/permissions.xml
index 047217dd..0292f489 100644
--- a/play-services-core/src/main/res/values-ro/permissions.xml
+++ b/play-services-core/src/main/res/values-ro/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-ro/strings.xml b/play-services-core/src/main/res/values-ro/strings.xml
index 6063b41f..ee15abdf 100644
--- a/play-services-core/src/main/res/values-ro/strings.xml
+++ b/play-services-core/src/main/res/values-ro/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-ru/permissions.xml b/play-services-core/src/main/res/values-ru/permissions.xml
index 0697c628..8a8169b5 100644
--- a/play-services-core/src/main/res/values-ru/permissions.xml
+++ b/play-services-core/src/main/res/values-ru/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml
index d645dc2f..71b80e93 100644
--- a/play-services-core/src/main/res/values-ru/strings.xml
+++ b/play-services-core/src/main/res/values-ru/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-sr/permissions.xml b/play-services-core/src/main/res/values-sr/permissions.xml
index 047217dd..0292f489 100644
--- a/play-services-core/src/main/res/values-sr/permissions.xml
+++ b/play-services-core/src/main/res/values-sr/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-sr/strings.xml b/play-services-core/src/main/res/values-sr/strings.xml
index f52ee2e7..ddec2e46 100644
--- a/play-services-core/src/main/res/values-sr/strings.xml
+++ b/play-services-core/src/main/res/values-sr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-uk/permissions.xml b/play-services-core/src/main/res/values-uk/permissions.xml
index 1cc22727..abac577c 100644
--- a/play-services-core/src/main/res/values-uk/permissions.xml
+++ b/play-services-core/src/main/res/values-uk/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-uk/strings.xml b/play-services-core/src/main/res/values-uk/strings.xml
index 5b1b4b49..15887c72 100644
--- a/play-services-core/src/main/res/values-uk/strings.xml
+++ b/play-services-core/src/main/res/values-uk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-zh-rTW/permissions.xml b/play-services-core/src/main/res/values-zh-rTW/permissions.xml
index c7704dba..2967224b 100644
--- a/play-services-core/src/main/res/values-zh-rTW/permissions.xml
+++ b/play-services-core/src/main/res/values-zh-rTW/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values-zh-rTW/strings.xml b/play-services-core/src/main/res/values-zh-rTW/strings.xml
index 1c4a73e7..6f5b5ac6 100644
--- a/play-services-core/src/main/res/values-zh-rTW/strings.xml
+++ b/play-services-core/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/arrays.xml b/play-services-core/src/main/res/values/arrays.xml
index 2d710536..9705bb8f 100644
--- a/play-services-core/src/main/res/values/arrays.xml
+++ b/play-services-core/src/main/res/values/arrays.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/bools.xml b/play-services-core/src/main/res/values/bools.xml
index 7b2133e9..ef602beb 100644
--- a/play-services-core/src/main/res/values/bools.xml
+++ b/play-services-core/src/main/res/values/bools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/colors.xml b/play-services-core/src/main/res/values/colors.xml
index 52111f1d..f6b29bbe 100644
--- a/play-services-core/src/main/res/values/colors.xml
+++ b/play-services-core/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/dimens.xml b/play-services-core/src/main/res/values/dimens.xml
index 9ebbdbc9..26e05305 100644
--- a/play-services-core/src/main/res/values/dimens.xml
+++ b/play-services-core/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/permissions.xml b/play-services-core/src/main/res/values/permissions.xml
index ad6e0375..5c342b00 100644
--- a/play-services-core/src/main/res/values/permissions.xml
+++ b/play-services-core/src/main/res/values/permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/signature.xml b/play-services-core/src/main/res/values/signature.xml
index eb52ad10..df53f65c 100644
--- a/play-services-core/src/main/res/values/signature.xml
+++ b/play-services-core/src/main/res/values/signature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index fa0548fd..c0a25123 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2017 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
index 532a2694..27c0a15c 100644
--- a/play-services-core/src/main/res/values/themes.xml
+++ b/play-services-core/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/xml/authenticator.xml b/play-services-core/src/main/res/xml/authenticator.xml
index d75a0f55..16c7aea5 100644
--- a/play-services-core/src/main/res/xml/authenticator.xml
+++ b/play-services-core/src/main/res/xml/authenticator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/xml/preferences_account.xml b/play-services-core/src/main/res/xml/preferences_account.xml
index 2cdc0958..74c27379 100644
--- a/play-services-core/src/main/res/xml/preferences_account.xml
+++ b/play-services-core/src/main/res/xml/preferences_account.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/xml/preferences_auth.xml b/play-services-core/src/main/res/xml/preferences_auth.xml
index 2f703271..f3d707b1 100644
--- a/play-services-core/src/main/res/xml/preferences_auth.xml
+++ b/play-services-core/src/main/res/xml/preferences_auth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/xml/preferences_gcm.xml b/play-services-core/src/main/res/xml/preferences_gcm.xml
index 67c79e08..bcfc63bb 100644
--- a/play-services-core/src/main/res/xml/preferences_gcm.xml
+++ b/play-services-core/src/main/res/xml/preferences_gcm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml b/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
index 87a6e7a4..449e2d60 100644
--- a/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
+++ b/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2013-2016 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
index b9d8f5fa..5d77ce8f 100644
--- a/play-services-core/src/main/res/xml/preferences_start.xml
+++ b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 microG Project Team
+  ~ Copyright (C) 2013-2017 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.