From 9a3c54ef0c210589006dbc9a8d4898cb5d9cb2e0 Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Wed, 19 Apr 2017 12:31:24 -0700
Subject: [PATCH] updating license header to remove ARR

---
 .travis.yml                                              | 2 +-
 appengine/.gitignore                                     | 2 +-
 .../example/appengine/analytics/AnalyticsServlet.java    | 2 +-
 .../analytics/src/main/webapp/WEB-INF/appengine-web.xml  | 2 +-
 appengine/analytics/src/main/webapp/WEB-INF/web.xml      | 2 +-
 .../example/appengine/appidentity/IdentityServlet.java   | 2 +-
 .../example/appengine/appidentity/SignForAppServlet.java | 2 +-
 .../com/example/appengine/appidentity/UrlShortener.java  | 2 +-
 .../appengine/appidentity/UrlShortenerServlet.java       | 2 +-
 .../appengine/appidentity/IdentityServletTest.java       | 2 +-
 .../appengine/appidentity/SignForAppServletTest.java     | 2 +-
 .../appengine/channel/ChannelPresenceServlet.java        | 2 +-
 .../main/java/com/example/appengine/channel/Game.java    | 2 +-
 .../com/example/appengine/channel/GetTokenServlet.java   | 2 +-
 .../java/com/example/appengine/channel/MoveServlet.java  | 2 +-
 .../java/com/example/appengine/channel/OfyHelper.java    | 2 +-
 .../com/example/appengine/channel/OpenedServlet.java     | 2 +-
 .../com/example/appengine/channel/TicTacToeServlet.java  | 2 +-
 .../channel/src/main/webapp/WEB-INF/appengine-web.xml    | 2 +-
 .../channel/src/main/webapp/WEB-INF/logging.properties   | 2 +-
 appengine/channel/src/main/webapp/WEB-INF/view/index.jsp | 2 +-
 appengine/channel/src/main/webapp/WEB-INF/web.xml        | 2 +-
 .../com/example/appengine/cloudsql/CloudSqlServlet.java  | 2 +-
 .../cloudsql/src/main/webapp/WEB-INF/appengine-web.xml   | 2 +-
 appengine/cloudsql/src/main/webapp/WEB-INF/web.xml       | 2 +-
 .../main/java/com/example/appengine/IndexesServlet.java  | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 .../src/main/webapp/WEB-INF/datastore-indexes.xml        | 2 +-
 .../indexes-exploding/src/main/webapp/WEB-INF/web.xml    | 2 +-
 .../java/com/example/appengine/IndexesServletTest.java   | 2 +-
 .../main/java/com/example/appengine/IndexesServlet.java  | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 .../src/main/webapp/WEB-INF/datastore-indexes.xml        | 2 +-
 .../indexes-perfect/src/main/webapp/WEB-INF/web.xml      | 2 +-
 .../java/com/example/appengine/IndexesServletTest.java   | 2 +-
 .../main/java/com/example/appengine/IndexesServlet.java  | 2 +-
 .../indexes/src/main/webapp/WEB-INF/appengine-web.xml    | 2 +-
 .../src/main/webapp/WEB-INF/datastore-indexes.xml        | 2 +-
 .../datastore/indexes/src/main/webapp/WEB-INF/web.xml    | 2 +-
 .../java/com/example/appengine/IndexesServletTest.java   | 2 +-
 .../java/com/example/appengine/AbstractGuestbook.java    | 2 +-
 .../com/example/appengine/AbstractGuestbookServlet.java  | 2 +-
 .../src/main/java/com/example/appengine/Greeting.java    | 2 +-
 .../src/main/java/com/example/appengine/Guestbook.java   | 2 +-
 .../java/com/example/appengine/GuestbookServlet.java     | 2 +-
 .../main/java/com/example/appengine/GuestbookStrong.java | 2 +-
 .../com/example/appengine/GuestbookStrongServlet.java    | 2 +-
 .../java/com/example/appengine/ListPeopleServlet.java    | 2 +-
 .../java/com/example/appengine/ProjectionServlet.java    | 2 +-
 .../main/java/com/example/appengine/StartupServlet.java  | 2 +-
 .../main/java/com/example/appengine/StatsServlet.java    | 2 +-
 .../datastore/src/main/java/com/example/time/Clock.java  | 2 +-
 .../src/main/java/com/example/time/SystemClock.java      | 2 +-
 .../main/java/com/example/time/testing/FakeClock.java    | 2 +-
 .../datastore/src/main/webapp/WEB-INF/appengine-web.xml  | 2 +-
 .../src/main/webapp/WEB-INF/datastore-indexes.xml        | 2 +-
 appengine/datastore/src/main/webapp/WEB-INF/web.xml      | 2 +-
 appengine/datastore/src/main/webapp/guestbook.jsp        | 2 +-
 .../test/java/com/example/appengine/EntitiesTest.java    | 2 +-
 .../java/com/example/appengine/GuestbookStrongTest.java  | 2 +-
 .../test/java/com/example/appengine/GuestbookTest.java   | 2 +-
 .../src/test/java/com/example/appengine/IndexesTest.java | 2 +-
 .../com/example/appengine/ListPeopleServletTest.java     | 2 +-
 .../com/example/appengine/MetadataEntityGroupTest.java   | 2 +-
 .../java/com/example/appengine/MetadataKindsTest.java    | 2 +-
 .../com/example/appengine/MetadataNamespacesTest.java    | 2 +-
 .../com/example/appengine/MetadataPropertiesTest.java    | 2 +-
 .../com/example/appengine/ProjectionServletTest.java     | 2 +-
 .../test/java/com/example/appengine/ProjectionTest.java  | 2 +-
 .../src/test/java/com/example/appengine/QueriesTest.java | 2 +-
 .../test/java/com/example/appengine/ReadPolicyTest.java  | 2 +-
 .../java/com/example/appengine/StartupServletTest.java   | 2 +-
 .../java/com/example/appengine/TransactionsTest.java     | 2 +-
 .../backend/src/main/webapp/WEB-INF/appengine-web.xml    | 2 +-
 .../backend/src/main/webapp/WEB-INF/logging.properties   | 2 +-
 .../backend/src/main/webapp/WEB-INF/web.xml              | 2 +-
 .../GaeFirebaseEventProxy/FirebaseEventProxy.java        | 2 +-
 .../ServletContextListenerImpl.java                      | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 .../src/main/webapp/WEB-INF/logging.properties           | 2 +-
 .../src/main/webapp/WEB-INF/web.xml                      | 2 +-
 .../gae-firebase-event-proxy/src/main/webapp/index.jsp   | 2 +-
 .../gae-firebase-listener-python/main.py                 | 2 +-
 .../com/example/appengine/firetactoe/DeleteServlet.java  | 2 +-
 .../example/appengine/firetactoe/FirebaseChannel.java    | 2 +-
 .../main/java/com/example/appengine/firetactoe/Game.java | 2 +-
 .../com/example/appengine/firetactoe/MoveServlet.java    | 2 +-
 .../example/appengine/firetactoe/ObjectifyHelper.java    | 2 +-
 .../com/example/appengine/firetactoe/OpenedServlet.java  | 2 +-
 .../example/appengine/firetactoe/TicTacToeServlet.java   | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 .../src/main/webapp/WEB-INF/logging.properties           | 2 +-
 .../src/main/webapp/WEB-INF/view/index.jsp               | 2 +-
 .../firebase-tictactoe/src/main/webapp/WEB-INF/web.xml   | 2 +-
 .../firebase-tictactoe/src/main/webapp/static/main.js    | 2 +-
 .../example/appengine/firetactoe/DeleteServletTest.java  | 2 +-
 .../appengine/firetactoe/FirebaseChannelTest.java        | 2 +-
 .../example/appengine/firetactoe/MoveServletTest.java    | 2 +-
 .../example/appengine/firetactoe/OpenedServletTest.java  | 2 +-
 .../appengine/firetactoe/TicTacToeServletTest.java       | 2 +-
 .../src/main/java/com/example/guestbook/Greeting.java    | 2 +-
 .../src/main/java/com/example/guestbook/Guestbook.java   | 2 +-
 .../src/main/java/com/example/guestbook/Persistence.java | 2 +-
 .../java/com/example/guestbook/SignGuestbookServlet.java | 2 +-
 .../test/java/com/example/guestbook/GreetingTest.java    | 2 +-
 .../com/example/guestbook/SignGuestbookServletTest.java  | 2 +-
 .../src/main/java/com/example/guestbook/Greeting.java    | 2 +-
 .../src/main/java/com/example/guestbook/Guestbook.java   | 2 +-
 .../src/main/java/com/example/guestbook/OfyHelper.java   | 2 +-
 .../java/com/example/guestbook/SignGuestbookServlet.java | 2 +-
 .../test/java/com/example/guestbook/GreetingTest.java    | 2 +-
 .../com/example/guestbook/GuestbookTestUtilities.java    | 2 +-
 .../com/example/guestbook/SignGuestbookServletTest.java  | 2 +-
 appengine/helloworld-new-plugins/build.gradle            | 2 +-
 .../com/example/appengine/helloworld/HelloServlet.java   | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 .../com/example/appengine/helloworld/HelloServlet.java   | 2 +-
 .../helloworld/src/main/webapp/WEB-INF/appengine-web.xml | 2 +-
 .../java/com/example/appengine/images/ImagesServlet.java | 2 +-
 .../images/src/main/webapp/WEB-INF/appengine-web.xml     | 2 +-
 .../java/com/example/appengine/logs/LogsServlet.java     | 2 +-
 appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml | 2 +-
 appengine/logs/src/main/webapp/WEB-INF/web.xml           | 2 +-
 .../com/example/appengine/mail/BounceHandlerServlet.java | 2 +-
 .../example/appengine/mail/HandleDiscussionEmail.java    | 2 +-
 .../java/com/example/appengine/mail/MailHandlerBase.java | 2 +-
 .../com/example/appengine/mail/MailHandlerServlet.java   | 2 +-
 .../java/com/example/appengine/mail/MailServlet.java     | 2 +-
 appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml | 2 +-
 .../mail/src/main/webapp/WEB-INF/logging.properties      | 2 +-
 appengine/mail/src/main/webapp/WEB-INF/web.xml           | 2 +-
 .../com/example/appengine/mailgun/MailgunServlet.java    | 2 +-
 .../mailgun/src/main/webapp/WEB-INF/appengine-web.xml    | 2 +-
 appengine/mailgun/src/main/webapp/WEB-INF/web.xml        | 2 +-
 appengine/mailgun/src/main/webapp/index.html             | 2 +-
 .../com/example/appengine/mailjet/MailjetServlet.java    | 2 +-
 .../mailjet/src/main/webapp/WEB-INF/appengine-web.xml    | 2 +-
 appengine/mailjet/src/main/webapp/WEB-INF/web.xml        | 2 +-
 appengine/mailjet/src/main/webapp/index.html             | 2 +-
 .../appengine/memcache/MemcacheAsyncCacheServlet.java    | 2 +-
 .../appengine/memcache/MemcacheBestPracticeServlet.java  | 2 +-
 .../appengine/memcache/MemcacheConcurrentServlet.java    | 2 +-
 .../appengine/memcache/MemcacheSyncCacheServlet.java     | 2 +-
 .../memcache/src/main/webapp/WEB-INF/appengine-web.xml   | 2 +-
 appengine/memcache/src/main/webapp/WEB-INF/web.xml       | 2 +-
 .../src/main/java/com/example/appengine/Greeting.java    | 2 +-
 .../src/main/java/com/example/appengine/Guestbook.java   | 2 +-
 .../java/com/example/appengine/MultitenancyServlet.java  | 2 +-
 .../main/java/com/example/appengine/NamespaceFilter.java | 2 +-
 .../src/main/java/com/example/appengine/OfyHelper.java   | 2 +-
 .../java/com/example/appengine/SignGuestbookServlet.java | 2 +-
 .../java/com/example/appengine/SomeRequestServlet.java   | 2 +-
 .../java/com/example/appengine/UpdateCountsServlet.java  | 2 +-
 .../test/java/com/example/appengine/GreetingTest.java    | 2 +-
 .../com/example/appengine/GuestbookTestUtilities.java    | 2 +-
 .../com/example/appengine/SignGuestbookServletTest.java  | 2 +-
 .../main/java/com/example/appengine/HelloServlet.java    | 2 +-
 .../main/java/com/example/appengine/Oauth2Filter.java    | 2 +-
 .../oauth2/src/main/webapp/WEB-INF/appengine-web.xml     | 2 +-
 appengine/oauth2/src/main/webapp/index.html              | 2 +-
 .../com/example/appengine/remote/RemoteApiExample.java   | 2 +-
 .../java/com/example/appengine/remote/RemoteServlet.java | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 .../remote/remote-server/src/main/webapp/WEB-INF/web.xml | 2 +-
 .../com/example/appengine/requests/LoggingServlet.java   | 2 +-
 .../com/example/appengine/requests/RequestsServlet.java  | 2 +-
 .../example/appengine/requests/LoggingServletTest.java   | 2 +-
 .../example/appengine/requests/RequestsServletTest.java  | 2 +-
 .../java/com/example/appengine/search/DeleteServlet.java | 2 +-
 .../com/example/appengine/search/DocumentServlet.java    | 2 +-
 .../java/com/example/appengine/search/IndexServlet.java  | 2 +-
 .../java/com/example/appengine/search/SchemaServlet.java | 2 +-
 .../example/appengine/search/SearchOptionServlet.java    | 2 +-
 .../java/com/example/appengine/search/SearchServlet.java | 2 +-
 .../main/java/com/example/appengine/search/Utils.java    | 2 +-
 .../search/src/main/webapp/WEB-INF/appengine-web.xml     | 2 +-
 .../com/example/appengine/search/DeleteServletTest.java  | 2 +-
 .../example/appengine/search/DocumentServletTest.java    | 2 +-
 .../com/example/appengine/search/IndexServletTest.java   | 2 +-
 .../com/example/appengine/search/SchemaServletTest.java  | 2 +-
 .../appengine/search/SearchOptionServletTest.java        | 2 +-
 .../com/example/appengine/search/SearchServletTest.java  | 2 +-
 .../java/com/example/appengine/search/UtilsTest.java     | 2 +-
 .../com/example/appengine/sendgrid/SendEmailServlet.java | 2 +-
 .../sendgrid/src/main/webapp/WEB-INF/appengine-web.xml   | 2 +-
 appengine/sendgrid/src/main/webapp/WEB-INF/web.xml       | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 appengine/static-files/src/main/webapp/WEB-INF/web.xml   | 2 +-
 .../com/example/appengine/taskqueue/push/Enqueue.java    | 2 +-
 .../com/example/appengine/taskqueue/push/Worker.java     | 2 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml            | 2 +-
 appengine/taskqueue-push/src/main/webapp/WEB-INF/web.xml | 2 +-
 appengine/taskqueue-push/src/main/webapp/index.html      | 2 +-
 .../com/example/appengine/taskqueue/push/WorkerTest.java | 2 +-
 .../java/com/example/taskqueue/TaskqueueServlet.java     | 2 +-
 .../pull/src/main/webapp/WEB-INF/appengine-web.xml       | 2 +-
 .../pull/src/main/webapp/WEB-INF/logging.properties      | 2 +-
 appengine/taskqueue/pull/src/main/webapp/WEB-INF/web.xml | 2 +-
 appengine/taskqueue/pull/src/main/webapp/tasks.jsp       | 2 +-
 .../com/example/appengine/twilio/ReceiveCallServlet.java | 2 +-
 .../com/example/appengine/twilio/ReceiveSmsServlet.java  | 2 +-
 .../com/example/appengine/twilio/SendSmsServlet.java     | 2 +-
 .../twilio/src/main/webapp/WEB-INF/appengine-web.xml     | 2 +-
 appengine/twilio/src/main/webapp/WEB-INF/web.xml         | 2 +-
 .../main/java/com/example/appengine/UrlFetchServlet.java | 2 +-
 appengine/urlfetch/src/main/webapp/main.jsp              | 2 +-
 .../java/com/example/appengine/users/UsersServlet.java   | 2 +-
 .../com/example/appengine/users/UsersServletTest.java    | 2 +-
 bigquery/cloud-client/pom.xml                            | 2 +-
 compute/cmdline/pom.xml                                  | 2 +-
 compute/cmdline/src/main/java/ComputeEngineSample.java   | 2 +-
 compute/error-reporting/pom.xml                          | 2 +-
 .../example/compute/errorreporting/ExceptionUtil.java    | 2 +-
 compute/mailjet/pom.xml                                  | 2 +-
 .../java/com/example/compute/mailjet/MailjetSender.java  | 2 +-
 .../com/example/compute/mailjet/MailjetSenderTest.java   | 2 +-
 .../com/example/compute/sendgrid/SendEmailServlet.java   | 2 +-
 .../java/com/google/datastore/snippets/TaskList.java     | 2 +-
 .../java/com/google/datastore/snippets/ConceptsTest.java | 2 +-
 endpoints/bookstore-grpc/api/build.gradle                | 2 +-
 .../bookstore-grpc/api/src/main/proto/bookstore.proto    | 2 +-
 endpoints/bookstore-grpc/client/build.gradle             | 2 +-
 .../endpoints/examples/bookstore/BookstoreClient.java    | 2 +-
 endpoints/bookstore-grpc/server/build.gradle             | 2 +-
 .../endpoints/examples/bookstore/BookstoreData.java      | 2 +-
 .../endpoints/examples/bookstore/BookstoreServer.java    | 2 +-
 .../endpoints/examples/bookstore/BookstoreService.java   | 2 +-
 .../google/endpoints/examples/bookstore/ShelfEntity.java | 2 +-
 endpoints/getting-started/container-engine.yaml          | 2 +-
 .../main/java/com/example/endpoints/AuthInfoServlet.java | 2 +-
 .../src/main/java/com/example/endpoints/EchoServlet.java | 2 +-
 flexible/analytics/pom.xml                               | 2 +-
 .../java/com/example/analytics/AnalyticsServlet.java     | 2 +-
 flexible/async-rest/pom.xml                              | 2 +-
 flexible/async-rest/src/main/appengine/app.yaml          | 2 +-
 .../java/com/google/appengine/demos/DumpServlet.java     | 2 +-
 .../appengine/demos/asyncrest/AbstractRestServlet.java   | 2 +-
 .../appengine/demos/asyncrest/AsyncRestServlet.java      | 2 +-
 .../appengine/demos/asyncrest/SerialRestServlet.java     | 2 +-
 flexible/cloudstorage/pom.xml                            | 2 +-
 .../java/com/example/cloudstorage/UploadServlet.java     | 2 +-
 flexible/cron/pom.xml                                    | 2 +-
 .../cron/src/main/java/com/example/cron/CronServlet.java | 2 +-
 flexible/datastore/pom.xml                               | 2 +-
 flexible/datastore/src/main/appengine/app.yaml           | 2 +-
 .../java/com/example/datastore/DatastoreServlet.java     | 2 +-
 flexible/disk/pom.xml                                    | 2 +-
 .../disk/src/main/java/com/example/disk/DiskServlet.java | 2 +-
 .../main/java/com/example/endpoints/AuthInfoServlet.java | 2 +-
 .../src/main/java/com/example/endpoints/EchoServlet.java | 2 +-
 flexible/extending-runtime/pom.xml                       | 2 +-
 .../com/example/extendingruntime/FortuneServlet.java     | 2 +-
 flexible/helloworld/build.gradle                         | 2 +-
 flexible/helloworld/pom.xml                              | 2 +-
 flexible/helloworld/src/main/appengine/app.yaml          | 2 +-
 .../com/example/flexible/helloworld/HelloServlet.java    | 2 +-
 flexible/mailgun/pom.xml                                 | 2 +-
 .../main/java/com/example/mailgun/MailgunServlet.java    | 2 +-
 flexible/mailjet/pom.xml                                 | 2 +-
 .../main/java/com/example/mailjet/MailjetServlet.java    | 2 +-
 flexible/mailjet/src/main/webapp/index.html              | 2 +-
 flexible/memcache/pom.xml                                | 2 +-
 .../main/java/com/example/memcache/MemcacheServlet.java  | 2 +-
 flexible/sendgrid/pom.xml                                | 2 +-
 .../main/java/com/example/sendgrid/SendEmailServlet.java | 2 +-
 .../main/java/com/google/appengine/sparkdemo/Main.java   | 2 +-
 .../com/google/appengine/sparkdemo/ResponseError.java    | 2 +-
 .../main/java/com/google/appengine/sparkdemo/User.java   | 2 +-
 .../com/google/appengine/sparkdemo/UserController.java   | 2 +-
 .../java/com/google/appengine/sparkdemo/UserService.java | 2 +-
 .../google/appengine/sparkdemo/UserControllerTest.java   | 2 +-
 .../com/google/appengine/sparkdemo/UserServiceTest.java  | 2 +-
 flexible/static-files/pom.xml                            | 2 +-
 flexible/twilio/pom.xml                                  | 2 +-
 .../main/java/com/example/twilio/ReceiveCallServlet.java | 2 +-
 .../main/java/com/example/twilio/ReceiveSmsServlet.java  | 2 +-
 .../src/main/java/com/example/twilio/SendSmsServlet.java | 2 +-
 language/analysis/demo.cmd                               | 9 +++++----
 language/analysis/demo.sh                                | 2 +-
 language/analysis/pom.xml                                | 2 +-
 .../java/com/google/cloud/language/samples/Analyze.java  | 2 +-
 .../com/google/cloud/language/samples/AnalyzeIT.java     | 2 +-
 .../com/google/cloud/language/samples/AnalyzeTest.java   | 2 +-
 language/cloud-client/pom.xml                            | 2 +-
 logging/cloud-client/pom.xml                             | 2 +-
 logging/src/test/java/ListLogsTest.java                  | 2 +-
 .../src/main/java/com/example/monitoring/Snippets.java   | 2 +-
 .../v2/src/test/java/CloudMonitoringAuthSampleTest.java  | 2 +-
 monitoring/v3/src/main/java/CreateCustomMetric.java      | 2 +-
 monitoring/v3/src/main/java/ListResources.java           | 2 +-
 monitoring/v3/src/test/java/CreateCustomMetricTest.java  | 2 +-
 monitoring/v3/src/test/java/ListResourcesTest.java       | 2 +-
 pubsub/cloud-client/pom.xml                              | 2 +-
 storage/cloud-client/pom.xml                             | 2 +-
 storage/json-api/pom.xml                                 | 2 +-
 .../main/java/CustomerSuppliedEncryptionKeysSamples.java | 2 +-
 storage/json-api/src/main/java/StorageFactory.java       | 2 +-
 storage/json-api/src/main/java/StorageUtils.java         | 2 +-
 storage/json-api/src/test/java/StorageSampleTest.java    | 2 +-
 storage/storage-transfer/pom.xml                         | 2 +-
 .../storage/storagetransfer/samples/AwsRequester.java    | 2 +-
 .../storagetransfer/samples/NearlineRequester.java       | 2 +-
 .../storage/storagetransfer/samples/RequestChecker.java  | 2 +-
 .../samples/RetryHttpInitializerWrapper.java             | 2 +-
 .../storagetransfer/samples/TransferClientCreator.java   | 2 +-
 .../storagetransfer/samples/TransferJobUtils.java        | 2 +-
 .../storagetransfer/samples/test/AwsRequesterTest.java   | 2 +-
 .../samples/test/NearlineRequesterTest.java              | 2 +-
 .../storagetransfer/samples/test/RequestCheckerTest.java | 2 +-
 .../samples/test/TransferJobUtilsTest.java               | 2 +-
 storage/xml-api/cmdline-sample/pom.xml                   | 2 +-
 .../cmdline-sample/src/test/java/StorageSampleTest.java  | 2 +-
 .../cloud/taskqueue/samples/DeferSampleServlet.java      | 2 +-
 .../deferred/src/main/webapp/WEB-INF/appengine-web.xml   | 2 +-
 taskqueue/deferred/src/main/webapp/WEB-INF/web.xml       | 2 +-
 taskqueue/deferred/src/main/webapp/guestbook.jsp         | 2 +-
 taskqueue/pull/pom.xml                                   | 2 +-
 taskqueue/pull/src/main/java/TaskQueueSample.java        | 2 +-
 .../example/cloud/translate/samples/TranslateText.java   | 2 +-
 .../cloud/translate/samples/TranslateTextTest.java       | 2 +-
 travis.sh                                                | 2 +-
 .../com/google/appengine/samples/AuthenticationTest.java | 2 +-
 .../com/google/appengine/samples/DeferredTaskTest.java   | 2 +-
 .../samples/LocalCustomPolicyHighRepDatastoreTest.java   | 2 +-
 .../com/google/appengine/samples/LocalDatastoreTest.java | 2 +-
 .../appengine/samples/LocalHighRepDatastoreTest.java     | 2 +-
 .../com/google/appengine/samples/LocalMemcacheTest.java  | 2 +-
 .../com/google/appengine/samples/LocalUrlFetchTest.java  | 2 +-
 .../java/com/google/appengine/samples/MyFirstTest.java   | 2 +-
 .../java/com/google/appengine/samples/ShortTest.java     | 2 +-
 .../google/appengine/samples/TaskQueueConfigTest.java    | 2 +-
 .../java/com/google/appengine/samples/TaskQueueTest.java | 2 +-
 vision/cloud-client/pom.xml                              | 2 +-
 vision/face-detection/pom.xml                            | 2 +-
 .../cloud/vision/samples/facedetect/FaceDetectApp.java   | 2 +-
 .../cloud/vision/samples/facedetect/FaceDetectAppIT.java | 2 +-
 .../vision/samples/facedetect/FaceDetectAppTest.java     | 2 +-
 vision/label/pom.xml                                     | 2 +-
 .../com/google/cloud/vision/samples/label/LabelApp.java  | 2 +-
 .../google/cloud/vision/samples/label/LabelAppIT.java    | 2 +-
 .../google/cloud/vision/samples/label/LabelAppTest.java  | 2 +-
 vision/landmark-detection/pom.xml                        | 2 +-
 .../vision/samples/landmarkdetection/DetectLandmark.java | 2 +-
 .../samples/landmarkdetection/DetectLandmarkIT.java      | 2 +-
 vision/text/pom.xml                                      | 2 +-
 .../com/google/cloud/vision/samples/text/TextAppIT.java  | 2 +-
 .../google/cloud/vision/samples/text/TextAppTest.java    | 2 +-
 347 files changed, 351 insertions(+), 350 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3cea8e9d2a1..128e302fb89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/appengine/.gitignore b/appengine/.gitignore
index 453750bc157..c94f025e98b 100644
--- a/appengine/.gitignore
+++ b/appengine/.gitignore
@@ -1,4 +1,4 @@
-#  Copyright 2015 Google Inc. All Rights Reserved.
+#  Copyright 2015 Google Inc.
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
 #  You may obtain a copy of the License at
diff --git a/appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java b/appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java
index ee8f5a678c4..4fd2d6186b6 100644
--- a/appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java
+++ b/appengine/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml
index efa1efaa42f..68ee6e05f5e 100644
--- a/appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/analytics/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/analytics/src/main/webapp/WEB-INF/web.xml b/appengine/analytics/src/main/webapp/WEB-INF/web.xml
index 1565774bf96..cb3033ed531 100644
--- a/appengine/analytics/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/analytics/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java
index bbc2237cfc9..d9d72a704c9 100644
--- a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java
+++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java
index 8a632aa78d5..3a9df0301fe 100644
--- a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java
+++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java
index a7d8e8b4330..4ef26aa135a 100644
--- a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java
+++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java
index a280c5dfcc0..324b8dcd0a1 100644
--- a/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java
+++ b/appengine/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java b/appengine/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java
index 3a8baf28f10..74041b24cd3 100644
--- a/appengine/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java
+++ b/appengine/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java b/appengine/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java
index 910d130d1ba..7cc1fa5411b 100644
--- a/appengine/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java
+++ b/appengine/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/java/com/example/appengine/channel/ChannelPresenceServlet.java b/appengine/channel/src/main/java/com/example/appengine/channel/ChannelPresenceServlet.java
index 2aafb433e86..0b806cb2d5e 100644
--- a/appengine/channel/src/main/java/com/example/appengine/channel/ChannelPresenceServlet.java
+++ b/appengine/channel/src/main/java/com/example/appengine/channel/ChannelPresenceServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/java/com/example/appengine/channel/Game.java b/appengine/channel/src/main/java/com/example/appengine/channel/Game.java
index 81956d28755..d84ef7247e7 100644
--- a/appengine/channel/src/main/java/com/example/appengine/channel/Game.java
+++ b/appengine/channel/src/main/java/com/example/appengine/channel/Game.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/java/com/example/appengine/channel/GetTokenServlet.java b/appengine/channel/src/main/java/com/example/appengine/channel/GetTokenServlet.java
index bc564b10b1f..c0fb1ac0b2a 100644
--- a/appengine/channel/src/main/java/com/example/appengine/channel/GetTokenServlet.java
+++ b/appengine/channel/src/main/java/com/example/appengine/channel/GetTokenServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/java/com/example/appengine/channel/MoveServlet.java b/appengine/channel/src/main/java/com/example/appengine/channel/MoveServlet.java
index 160113842c7..e3aa47ab4dd 100644
--- a/appengine/channel/src/main/java/com/example/appengine/channel/MoveServlet.java
+++ b/appengine/channel/src/main/java/com/example/appengine/channel/MoveServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/java/com/example/appengine/channel/OfyHelper.java b/appengine/channel/src/main/java/com/example/appengine/channel/OfyHelper.java
index 57993fe967f..8574aa2655c 100644
--- a/appengine/channel/src/main/java/com/example/appengine/channel/OfyHelper.java
+++ b/appengine/channel/src/main/java/com/example/appengine/channel/OfyHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/java/com/example/appengine/channel/OpenedServlet.java b/appengine/channel/src/main/java/com/example/appengine/channel/OpenedServlet.java
index 63106f4761c..6e4a2088fe6 100644
--- a/appengine/channel/src/main/java/com/example/appengine/channel/OpenedServlet.java
+++ b/appengine/channel/src/main/java/com/example/appengine/channel/OpenedServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/java/com/example/appengine/channel/TicTacToeServlet.java b/appengine/channel/src/main/java/com/example/appengine/channel/TicTacToeServlet.java
index c27c9744064..83bde707a87 100644
--- a/appengine/channel/src/main/java/com/example/appengine/channel/TicTacToeServlet.java
+++ b/appengine/channel/src/main/java/com/example/appengine/channel/TicTacToeServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml
index 9a27ea3b10c..93d1771b576 100644
--- a/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/channel/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  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/appengine/channel/src/main/webapp/WEB-INF/logging.properties b/appengine/channel/src/main/webapp/WEB-INF/logging.properties
index f36a2ec76e0..9b29028efa7 100644
--- a/appengine/channel/src/main/webapp/WEB-INF/logging.properties
+++ b/appengine/channel/src/main/webapp/WEB-INF/logging.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/appengine/channel/src/main/webapp/WEB-INF/view/index.jsp b/appengine/channel/src/main/webapp/WEB-INF/view/index.jsp
index af33d85b7f9..bd045262dc8 100644
--- a/appengine/channel/src/main/webapp/WEB-INF/view/index.jsp
+++ b/appengine/channel/src/main/webapp/WEB-INF/view/index.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  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/appengine/channel/src/main/webapp/WEB-INF/web.xml b/appengine/channel/src/main/webapp/WEB-INF/web.xml
index ea2d3e72f10..8d1af582346 100644
--- a/appengine/channel/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/channel/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  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/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java b/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
index da3ada939cb..9e09fbede8e 100644
--- a/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
+++ b/appengine/cloudsql/src/main/java/com/example/appengine/cloudsql/CloudSqlServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
index 2ca4fde21ca..731d5aa24ed 100644
--- a/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/cloudsql/src/main/webapp/WEB-INF/web.xml b/appengine/cloudsql/src/main/webapp/WEB-INF/web.xml
index 05375810dc6..2f5b0dfbd32 100644
--- a/appengine/cloudsql/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/cloudsql/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java b/appengine/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
index dff4396b797..04d4fe018d4 100644
--- a/appengine/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
+++ b/appengine/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
index e9d8b21cb8f..2b12170b8f0 100644
--- a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
index 52fb35e0520..f1f44c38f67 100644
--- a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Google Inc. All Rights Reserved.                        -->
+<!-- Copyright 2016 Google Inc.                        -->
 <!--                                                                        -->
 <!-- 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/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml
index 049fd7a05e7..6af27edbd87 100644
--- a/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
index 451f2189d34..ea86f530fef 100644
--- a/appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
+++ b/appengine/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java b/appengine/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
index 0dbca3ce307..5a01f1a53e5 100644
--- a/appengine/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
+++ b/appengine/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
index e9d8b21cb8f..2b12170b8f0 100644
--- a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
index bb56fb4bf50..30d97392eaa 100644
--- a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE silent] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml
index 049fd7a05e7..6af27edbd87 100644
--- a/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
index e82f5b302ab..d1816a7034d 100644
--- a/appengine/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
+++ b/appengine/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java b/appengine/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java
index 78605f64bf2..5493ce1f1a9 100644
--- a/appengine/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java
+++ b/appengine/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
index e9d8b21cb8f..2b12170b8f0 100644
--- a/appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
index 2c7be706846..28046fb9571 100644
--- a/appengine/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/appengine/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 Google Inc. All Rights Reserved.                        -->
+<!-- Copyright 2016 Google Inc.                        -->
 <!--                                                                        -->
 <!-- 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/appengine/datastore/indexes/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/indexes/src/main/webapp/WEB-INF/web.xml
index 049fd7a05e7..6af27edbd87 100644
--- a/appengine/datastore/indexes/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/datastore/indexes/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java
index daf6e8f3821..83575239136 100644
--- a/appengine/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java
+++ b/appengine/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbook.java b/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbook.java
index a11707a8819..b87edf7eeba 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbook.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbookServlet.java b/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbookServlet.java
index ba6f8c95ce9..e77231497c6 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbookServlet.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/AbstractGuestbookServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/Greeting.java b/appengine/datastore/src/main/java/com/example/appengine/Greeting.java
index ad083267f05..352aa0a1dde 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/Greeting.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/Greeting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/Guestbook.java b/appengine/datastore/src/main/java/com/example/appengine/Guestbook.java
index 36649c958fc..83e984818c4 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/Guestbook.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/Guestbook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/GuestbookServlet.java b/appengine/datastore/src/main/java/com/example/appengine/GuestbookServlet.java
index 8c01d83cb09..5ebab796530 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/GuestbookServlet.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/GuestbookServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrong.java b/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrong.java
index 7c481556a81..5f3ad23b91d 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrong.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrongServlet.java b/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrongServlet.java
index 004584119fc..e73ae1e0fcc 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrongServlet.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/GuestbookStrongServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/ListPeopleServlet.java b/appengine/datastore/src/main/java/com/example/appengine/ListPeopleServlet.java
index 2da95898980..b59aaab3aa0 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/ListPeopleServlet.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/ListPeopleServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/ProjectionServlet.java b/appengine/datastore/src/main/java/com/example/appengine/ProjectionServlet.java
index ffeff7d2d22..81bdaf6cf9b 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/ProjectionServlet.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/ProjectionServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/StartupServlet.java b/appengine/datastore/src/main/java/com/example/appengine/StartupServlet.java
index 03fe99b3ea9..2c523f3db15 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/StartupServlet.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/StartupServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/appengine/StatsServlet.java b/appengine/datastore/src/main/java/com/example/appengine/StatsServlet.java
index 0b3585fd7b9..b6d6925fc12 100644
--- a/appengine/datastore/src/main/java/com/example/appengine/StatsServlet.java
+++ b/appengine/datastore/src/main/java/com/example/appengine/StatsServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/time/Clock.java b/appengine/datastore/src/main/java/com/example/time/Clock.java
index 60ee9a49d0c..7d75e2b62d4 100644
--- a/appengine/datastore/src/main/java/com/example/time/Clock.java
+++ b/appengine/datastore/src/main/java/com/example/time/Clock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/time/SystemClock.java b/appengine/datastore/src/main/java/com/example/time/SystemClock.java
index ecf15c34207..032230bd0c4 100644
--- a/appengine/datastore/src/main/java/com/example/time/SystemClock.java
+++ b/appengine/datastore/src/main/java/com/example/time/SystemClock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/java/com/example/time/testing/FakeClock.java b/appengine/datastore/src/main/java/com/example/time/testing/FakeClock.java
index 5b05841e439..7ede635d762 100644
--- a/appengine/datastore/src/main/java/com/example/time/testing/FakeClock.java
+++ b/appengine/datastore/src/main/java/com/example/time/testing/FakeClock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
index c322e7d016e..0219c120504 100644
--- a/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/datastore/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/datastore/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine/datastore/src/main/webapp/WEB-INF/datastore-indexes.xml
index 662ebb0c35e..93f9a3d76cc 100644
--- a/appengine/datastore/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/appengine/datastore/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/datastore/src/main/webapp/WEB-INF/web.xml b/appengine/datastore/src/main/webapp/WEB-INF/web.xml
index babf6d1eeb6..cf06f60d61e 100644
--- a/appengine/datastore/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/datastore/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/src/main/webapp/guestbook.jsp b/appengine/datastore/src/main/webapp/guestbook.jsp
index 0be736e697e..4b65c8a308e 100644
--- a/appengine/datastore/src/main/webapp/guestbook.jsp
+++ b/appengine/datastore/src/main/webapp/guestbook.jsp
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/appengine/datastore/src/test/java/com/example/appengine/EntitiesTest.java b/appengine/datastore/src/test/java/com/example/appengine/EntitiesTest.java
index 769b229491e..c9b7640efe4 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/EntitiesTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/EntitiesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java b/appengine/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java
index abb845cacd4..dcff5595dab 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/GuestbookTest.java b/appengine/datastore/src/test/java/com/example/appengine/GuestbookTest.java
index bc9d1de4afd..82d5fd11204 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/GuestbookTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/GuestbookTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/IndexesTest.java b/appengine/datastore/src/test/java/com/example/appengine/IndexesTest.java
index a12912c43d0..2a9284f3809 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/IndexesTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/IndexesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java b/appengine/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java
index b1f33bbf3f9..5ea0920a153 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java
index a39f4af36ca..89545c3e208 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java
index 998d2ab33cf..16f3d7026d3 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/MetadataKindsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java
index e31f7a14852..98c09d64954 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/MetadataNamespacesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java b/appengine/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java
index 88ba79008ab..64b32c6dc38 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/MetadataPropertiesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/ProjectionServletTest.java b/appengine/datastore/src/test/java/com/example/appengine/ProjectionServletTest.java
index 7e71cfee7a5..101abf06052 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/ProjectionServletTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/ProjectionServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/ProjectionTest.java b/appengine/datastore/src/test/java/com/example/appengine/ProjectionTest.java
index 494f1577ce4..e8f3e81533b 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/ProjectionTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/ProjectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/QueriesTest.java b/appengine/datastore/src/test/java/com/example/appengine/QueriesTest.java
index 07c3dd13c60..d8a2e61dd5c 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/QueriesTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/QueriesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/ReadPolicyTest.java b/appengine/datastore/src/test/java/com/example/appengine/ReadPolicyTest.java
index 0742a37acd1..054088cd863 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/ReadPolicyTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/ReadPolicyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/StartupServletTest.java b/appengine/datastore/src/test/java/com/example/appengine/StartupServletTest.java
index cf54f983097..c6876701c1a 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/StartupServletTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/StartupServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/datastore/src/test/java/com/example/appengine/TransactionsTest.java b/appengine/datastore/src/test/java/com/example/appengine/TransactionsTest.java
index 6247f3fe06c..0b958cbf0da 100644
--- a/appengine/datastore/src/test/java/com/example/appengine/TransactionsTest.java
+++ b/appengine/datastore/src/test/java/com/example/appengine/TransactionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
index a326cf4f23a..15dfe35ee60 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/logging.properties b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/logging.properties
index a375465b2fc..6279d0fef33 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/logging.properties
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/logging.properties
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
index 56eec17a4c3..f8d1d03f98a 100644
--- a/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
index bd706ba03e4..4a115b74c5d 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
index ffee0cee769..ca11ec2ba9a 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
index dcf0932551f..a98bd68b468 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
index e325f6cb079..a2cc700aef5 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
index 427fd14c909..5c9f392b35e 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp
index ffc7d85f599..1caf98ad673 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp
@@ -1,5 +1,5 @@
 <%--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/appengine/firebase-event-proxy/gae-firebase-listener-python/main.py b/appengine/firebase-event-proxy/gae-firebase-listener-python/main.py
index 49145bbd749..50990be57b0 100644
--- a/appengine/firebase-event-proxy/gae-firebase-listener-python/main.py
+++ b/appengine/firebase-event-proxy/gae-firebase-listener-python/main.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/DeleteServlet.java b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/DeleteServlet.java
index 5975aa191c4..1988424fbb6 100644
--- a/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/DeleteServlet.java
+++ b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/DeleteServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/FirebaseChannel.java b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/FirebaseChannel.java
index 57502678380..5c859d65dbe 100644
--- a/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/FirebaseChannel.java
+++ b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/FirebaseChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/Game.java b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/Game.java
index a68aa5c5be6..7f6a1e84135 100644
--- a/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/Game.java
+++ b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/Game.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/MoveServlet.java b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/MoveServlet.java
index 605749969c4..4911d22bc37 100644
--- a/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/MoveServlet.java
+++ b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/MoveServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/ObjectifyHelper.java b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/ObjectifyHelper.java
index 1bd510cde83..abc1a28e33c 100644
--- a/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/ObjectifyHelper.java
+++ b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/ObjectifyHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/OpenedServlet.java b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/OpenedServlet.java
index 8a27c28ee10..2e71f9391cb 100644
--- a/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/OpenedServlet.java
+++ b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/OpenedServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/TicTacToeServlet.java b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/TicTacToeServlet.java
index 9bba63d862d..8b248577971 100644
--- a/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/TicTacToeServlet.java
+++ b/appengine/firebase-tictactoe/src/main/java/com/example/appengine/firetactoe/TicTacToeServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/appengine-web.xml
index 60505d89c7a..3a0d4ce9601 100644
--- a/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  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/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/logging.properties b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/logging.properties
index f36a2ec76e0..9b29028efa7 100644
--- a/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/logging.properties
+++ b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/logging.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/view/index.jsp b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/view/index.jsp
index dacb82b3110..fab4ac6f0ec 100644
--- a/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/view/index.jsp
+++ b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/view/index.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/web.xml b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/web.xml
index 334b6e84ca8..772f32fc601 100644
--- a/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/firebase-tictactoe/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  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/appengine/firebase-tictactoe/src/main/webapp/static/main.js b/appengine/firebase-tictactoe/src/main/webapp/static/main.js
index 4633fbe26c7..6ae24b0247d 100644
--- a/appengine/firebase-tictactoe/src/main/webapp/static/main.js
+++ b/appengine/firebase-tictactoe/src/main/webapp/static/main.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java
index e89cff31704..0df68aaaefc 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/DeleteServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java
index 116a46e0bd2..0c92863f77e 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/FirebaseChannelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
index 5083c4c96c9..ac07a251028 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/MoveServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java
index 593f4287988..9b2990196f6 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/OpenedServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java
index aa45cba0875..7f5fdf90150 100644
--- a/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java
+++ b/appengine/firebase-tictactoe/src/test/java/com/example/appengine/firetactoe/TicTacToeServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
index a32777318c3..13ad798fd09 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
index 218a7e292b8..4f2aeb69a5d 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
index bb6b53a16fe..1b68b8541e9 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java
index 8d6061a7146..2c95c5c3aee 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/SignGuestbookServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java
index 6ddaa732d37..a91390569ad 100644
--- a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java
+++ b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/GreetingTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
index 243fca2a858..4a5435eafe7 100644
--- a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
+++ b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java
index 29c37d066ce..8067cd3fce7 100644
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java
+++ b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * 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/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java
index 73786e00249..2b490aeff79 100644
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java
+++ b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * 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/appengine/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java
index a5837295656..3d34612007c 100644
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java
+++ b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
diff --git a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java
index 2b7d368642a..e32912cb933 100644
--- a/appengine/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java
+++ b/appengine/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * 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/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java
index 085c1778275..27d3030149d 100644
--- a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java
+++ b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GreetingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java
index 4480fd111bd..cbd72b57b28 100644
--- a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java
+++ b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/GuestbookTestUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
index 1c762be9511..1c01ab37f8d 100644
--- a/appengine/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
+++ b/appengine/guestbook-objectify/src/test/java/com/example/guestbook/SignGuestbookServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/helloworld-new-plugins/build.gradle b/appengine/helloworld-new-plugins/build.gradle
index 777de4021a5..0ae1057fac0 100644
--- a/appengine/helloworld-new-plugins/build.gradle
+++ b/appengine/helloworld-new-plugins/build.gradle
@@ -1,4 +1,4 @@
-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2015 Google Inc.
 //
 //  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/appengine/helloworld-new-plugins/src/main/java/com/example/appengine/helloworld/HelloServlet.java b/appengine/helloworld-new-plugins/src/main/java/com/example/appengine/helloworld/HelloServlet.java
index d9135a0ce63..5868bf82f9d 100644
--- a/appengine/helloworld-new-plugins/src/main/java/com/example/appengine/helloworld/HelloServlet.java
+++ b/appengine/helloworld-new-plugins/src/main/java/com/example/appengine/helloworld/HelloServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/helloworld-new-plugins/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/helloworld-new-plugins/src/main/webapp/WEB-INF/appengine-web.xml
index 3ee2fa64c4e..3bf1a94031c 100644
--- a/appengine/helloworld-new-plugins/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/helloworld-new-plugins/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java b/appengine/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
index d9135a0ce63..5868bf82f9d 100644
--- a/appengine/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
+++ b/appengine/helloworld/src/main/java/com/example/appengine/helloworld/HelloServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
index 468b6d0430a..4cbf6f1fefc 100644
--- a/appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/helloworld/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java b/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
index 211f7664b65..2f0c1f9864a 100644
--- a/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
+++ b/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
index 07bb4d7de99..61d31edda05 100644
--- a/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/images/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java b/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
index ad6e13ba10f..a889763e989 100644
--- a/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
+++ b/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 Google Inc.
  *
  * 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/appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml
index 73eefaee076..5baf77f0839 100644
--- a/appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/logs/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/logs/src/main/webapp/WEB-INF/web.xml b/appengine/logs/src/main/webapp/WEB-INF/web.xml
index fa2cb4457c4..3b156c9b98c 100644
--- a/appengine/logs/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/logs/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java b/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java
index b46eecae1e1..51f4536ac8a 100644
--- a/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/BounceHandlerServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java b/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java
index 104714738eb..b673497f389 100644
--- a/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/HandleDiscussionEmail.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerBase.java b/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerBase.java
index b8458224e53..dd16582bb39 100644
--- a/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerBase.java
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerBase.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerServlet.java b/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerServlet.java
index 47eee63801b..0262d41c95a 100644
--- a/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerServlet.java
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/MailHandlerServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/mail/src/main/java/com/example/appengine/mail/MailServlet.java b/appengine/mail/src/main/java/com/example/appengine/mail/MailServlet.java
index ea31ba09a83..a51fe854c6a 100644
--- a/appengine/mail/src/main/java/com/example/appengine/mail/MailServlet.java
+++ b/appengine/mail/src/main/java/com/example/appengine/mail/MailServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml
index 176888c9b7d..afe059ff0c0 100644
--- a/appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/mail/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mail/src/main/webapp/WEB-INF/logging.properties b/appengine/mail/src/main/webapp/WEB-INF/logging.properties
index 2939d57bcbe..45b39a32093 100644
--- a/appengine/mail/src/main/webapp/WEB-INF/logging.properties
+++ b/appengine/mail/src/main/webapp/WEB-INF/logging.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/appengine/mail/src/main/webapp/WEB-INF/web.xml b/appengine/mail/src/main/webapp/WEB-INF/web.xml
index f8bae043de6..393f67066ad 100644
--- a/appengine/mail/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/mail/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java b/appengine/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
index 899d983a0b0..ad30b5e983a 100644
--- a/appengine/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
+++ b/appengine/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
index f720d147b74..21aa263a33d 100644
--- a/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/mailgun/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mailgun/src/main/webapp/WEB-INF/web.xml b/appengine/mailgun/src/main/webapp/WEB-INF/web.xml
index 26e63250cbe..9f22b168016 100644
--- a/appengine/mailgun/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/mailgun/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mailgun/src/main/webapp/index.html b/appengine/mailgun/src/main/webapp/index.html
index 6049c6945e7..9ec44eaad7c 100644
--- a/appengine/mailgun/src/main/webapp/index.html
+++ b/appengine/mailgun/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java b/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
index 164ba4d10bc..e9922a71438 100644
--- a/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
+++ b/appengine/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
index 653950db1c9..155a42e7135 100644
--- a/appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/mailjet/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mailjet/src/main/webapp/WEB-INF/web.xml b/appengine/mailjet/src/main/webapp/WEB-INF/web.xml
index e0d543ad029..9d906fce8f8 100644
--- a/appengine/mailjet/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/mailjet/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/mailjet/src/main/webapp/index.html b/appengine/mailjet/src/main/webapp/index.html
index 037fddcea91..10f5dcc59dd 100644
--- a/appengine/mailjet/src/main/webapp/index.html
+++ b/appengine/mailjet/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java
index 802777e8481..d1960e06cb5 100644
--- a/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java
+++ b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheAsyncCacheServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java
index 8283fc16532..b4bd8cc9cc9 100644
--- a/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java
+++ b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheBestPracticeServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java
index 8d3280e23d3..212c5d990a8 100644
--- a/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java
+++ b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheConcurrentServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java
index b517256bf18..97307dc10e6 100644
--- a/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java
+++ b/appengine/memcache/src/main/java/com/example/appengine/memcache/MemcacheSyncCacheServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml
index 089c609c550..08f64ad1d30 100644
--- a/appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/memcache/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/memcache/src/main/webapp/WEB-INF/web.xml b/appengine/memcache/src/main/webapp/WEB-INF/web.xml
index 80aebf40b25..d4a7e38c981 100644
--- a/appengine/memcache/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/memcache/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/multitenancy/src/main/java/com/example/appengine/Greeting.java b/appengine/multitenancy/src/main/java/com/example/appengine/Greeting.java
index bc4a8252b57..c0645fc4fd8 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/Greeting.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/Greeting.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * 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/appengine/multitenancy/src/main/java/com/example/appengine/Guestbook.java b/appengine/multitenancy/src/main/java/com/example/appengine/Guestbook.java
index bc22587b99f..1da82bc5b7f 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/Guestbook.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/Guestbook.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * 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/appengine/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java b/appengine/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java
index 78aaf1ca7f2..ad206f06496 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/MultitenancyServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java b/appengine/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java
index b67802c8339..ed412169c99 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/NamespaceFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/multitenancy/src/main/java/com/example/appengine/OfyHelper.java b/appengine/multitenancy/src/main/java/com/example/appengine/OfyHelper.java
index 641c9c4f8ab..8dcd38e8d1f 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/OfyHelper.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/OfyHelper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * 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/appengine/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java b/appengine/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java
index 44dcb4151e7..8726c91ce24 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014-2015 Google Inc. All Rights Reserved.
+ * Copyright 2014-2015 Google Inc.
  *
  * 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/appengine/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java b/appengine/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java
index 265f60f3f17..4157164a1f4 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/SomeRequestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java b/appengine/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java
index b65b40ee92a..cb1fbe8a3e3 100644
--- a/appengine/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java
+++ b/appengine/multitenancy/src/main/java/com/example/appengine/UpdateCountsServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/multitenancy/src/test/java/com/example/appengine/GreetingTest.java b/appengine/multitenancy/src/test/java/com/example/appengine/GreetingTest.java
index a93bfe788ab..b58b2f3d9f6 100644
--- a/appengine/multitenancy/src/test/java/com/example/appengine/GreetingTest.java
+++ b/appengine/multitenancy/src/test/java/com/example/appengine/GreetingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java b/appengine/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java
index 99a40b5fe49..6b2c41761d0 100644
--- a/appengine/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java
+++ b/appengine/multitenancy/src/test/java/com/example/appengine/GuestbookTestUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/multitenancy/src/test/java/com/example/appengine/SignGuestbookServletTest.java b/appengine/multitenancy/src/test/java/com/example/appengine/SignGuestbookServletTest.java
index e7beb16514d..7a532ca9d3f 100644
--- a/appengine/multitenancy/src/test/java/com/example/appengine/SignGuestbookServletTest.java
+++ b/appengine/multitenancy/src/test/java/com/example/appengine/SignGuestbookServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/oauth2/src/main/java/com/example/appengine/HelloServlet.java b/appengine/oauth2/src/main/java/com/example/appengine/HelloServlet.java
index 4f8f0639239..35e0e1762ed 100644
--- a/appengine/oauth2/src/main/java/com/example/appengine/HelloServlet.java
+++ b/appengine/oauth2/src/main/java/com/example/appengine/HelloServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java b/appengine/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java
index 298be5d2543..f5cf8a969da 100644
--- a/appengine/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java
+++ b/appengine/oauth2/src/main/java/com/example/appengine/Oauth2Filter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml
index c322e7d016e..0219c120504 100644
--- a/appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/oauth2/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/oauth2/src/main/webapp/index.html b/appengine/oauth2/src/main/webapp/index.html
index 64d74302528..cb2401db6ab 100644
--- a/appengine/oauth2/src/main/webapp/index.html
+++ b/appengine/oauth2/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java b/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
index 3a6c3b42b36..97131664214 100644
--- a/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
+++ b/appengine/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java b/appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
index 45f910cddcc..31e2b06f823 100644
--- a/appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
+++ b/appengine/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
index 089c609c550..08f64ad1d30 100644
--- a/appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml b/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
index 4fe6a96380f..0ec344f02b5 100644
--- a/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/remote/remote-server/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/requests/src/main/java/com/example/appengine/requests/LoggingServlet.java b/appengine/requests/src/main/java/com/example/appengine/requests/LoggingServlet.java
index 434796b7c9e..213ab065aab 100644
--- a/appengine/requests/src/main/java/com/example/appengine/requests/LoggingServlet.java
+++ b/appengine/requests/src/main/java/com/example/appengine/requests/LoggingServlet.java
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 Google Inc.
  *
  * 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/appengine/requests/src/main/java/com/example/appengine/requests/RequestsServlet.java b/appengine/requests/src/main/java/com/example/appengine/requests/RequestsServlet.java
index 7c7f562bf6e..82c649e0eab 100644
--- a/appengine/requests/src/main/java/com/example/appengine/requests/RequestsServlet.java
+++ b/appengine/requests/src/main/java/com/example/appengine/requests/RequestsServlet.java
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 Google Inc.
  *
  * 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/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java b/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
index d2f0055116c..6f3469e6b5c 100644
--- a/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
+++ b/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java b/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
index d2dbec7e016..639aa0a6a2a 100644
--- a/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
+++ b/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/java/com/example/appengine/search/DeleteServlet.java b/appengine/search/src/main/java/com/example/appengine/search/DeleteServlet.java
index 89ba596317a..da9fb6125d3 100644
--- a/appengine/search/src/main/java/com/example/appengine/search/DeleteServlet.java
+++ b/appengine/search/src/main/java/com/example/appengine/search/DeleteServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/java/com/example/appengine/search/DocumentServlet.java b/appengine/search/src/main/java/com/example/appengine/search/DocumentServlet.java
index 9f53aeb3c3f..eaa26cd7388 100644
--- a/appengine/search/src/main/java/com/example/appengine/search/DocumentServlet.java
+++ b/appengine/search/src/main/java/com/example/appengine/search/DocumentServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/java/com/example/appengine/search/IndexServlet.java b/appengine/search/src/main/java/com/example/appengine/search/IndexServlet.java
index c1394571c5f..390b74c2d5e 100644
--- a/appengine/search/src/main/java/com/example/appengine/search/IndexServlet.java
+++ b/appengine/search/src/main/java/com/example/appengine/search/IndexServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/java/com/example/appengine/search/SchemaServlet.java b/appengine/search/src/main/java/com/example/appengine/search/SchemaServlet.java
index 7be312c260f..4deda3e3cfa 100644
--- a/appengine/search/src/main/java/com/example/appengine/search/SchemaServlet.java
+++ b/appengine/search/src/main/java/com/example/appengine/search/SchemaServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java b/appengine/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java
index 59071bbfbe4..83a63287fa5 100644
--- a/appengine/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java
+++ b/appengine/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/java/com/example/appengine/search/SearchServlet.java b/appengine/search/src/main/java/com/example/appengine/search/SearchServlet.java
index efb32d6a242..e92005b55a6 100644
--- a/appengine/search/src/main/java/com/example/appengine/search/SearchServlet.java
+++ b/appengine/search/src/main/java/com/example/appengine/search/SearchServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/java/com/example/appengine/search/Utils.java b/appengine/search/src/main/java/com/example/appengine/search/Utils.java
index f0f84ddf524..4fab0159303 100644
--- a/appengine/search/src/main/java/com/example/appengine/search/Utils.java
+++ b/appengine/search/src/main/java/com/example/appengine/search/Utils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/search/src/main/webapp/WEB-INF/appengine-web.xml
index c322e7d016e..0219c120504 100644
--- a/appengine/search/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/search/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/search/src/test/java/com/example/appengine/search/DeleteServletTest.java b/appengine/search/src/test/java/com/example/appengine/search/DeleteServletTest.java
index d520d56c1d3..15b9deec1fb 100644
--- a/appengine/search/src/test/java/com/example/appengine/search/DeleteServletTest.java
+++ b/appengine/search/src/test/java/com/example/appengine/search/DeleteServletTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/test/java/com/example/appengine/search/DocumentServletTest.java b/appengine/search/src/test/java/com/example/appengine/search/DocumentServletTest.java
index d5b32f2c62c..55bb6ed5350 100644
--- a/appengine/search/src/test/java/com/example/appengine/search/DocumentServletTest.java
+++ b/appengine/search/src/test/java/com/example/appengine/search/DocumentServletTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/test/java/com/example/appengine/search/IndexServletTest.java b/appengine/search/src/test/java/com/example/appengine/search/IndexServletTest.java
index 5a084b85d9a..ce3a3eee55c 100644
--- a/appengine/search/src/test/java/com/example/appengine/search/IndexServletTest.java
+++ b/appengine/search/src/test/java/com/example/appengine/search/IndexServletTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/test/java/com/example/appengine/search/SchemaServletTest.java b/appengine/search/src/test/java/com/example/appengine/search/SchemaServletTest.java
index 2a9fb122642..c5c459c55fa 100644
--- a/appengine/search/src/test/java/com/example/appengine/search/SchemaServletTest.java
+++ b/appengine/search/src/test/java/com/example/appengine/search/SchemaServletTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java b/appengine/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java
index 2b759eaf1bf..ae055868e9e 100644
--- a/appengine/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java
+++ b/appengine/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/test/java/com/example/appengine/search/SearchServletTest.java b/appengine/search/src/test/java/com/example/appengine/search/SearchServletTest.java
index f2fa060e48a..a405b5a8693 100644
--- a/appengine/search/src/test/java/com/example/appengine/search/SearchServletTest.java
+++ b/appengine/search/src/test/java/com/example/appengine/search/SearchServletTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/search/src/test/java/com/example/appengine/search/UtilsTest.java b/appengine/search/src/test/java/com/example/appengine/search/UtilsTest.java
index ff8ee847c71..e3a3e58cf2a 100644
--- a/appengine/search/src/test/java/com/example/appengine/search/UtilsTest.java
+++ b/appengine/search/src/test/java/com/example/appengine/search/UtilsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java b/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java
index 421543ac98b..db086c739eb 100644
--- a/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java
+++ b/appengine/sendgrid/src/main/java/com/example/appengine/sendgrid/SendEmailServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
index 1e2b8457676..7f8d58f2331 100644
--- a/appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/sendgrid/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/sendgrid/src/main/webapp/WEB-INF/web.xml b/appengine/sendgrid/src/main/webapp/WEB-INF/web.xml
index ad56ea9c2e4..23a0e83b821 100644
--- a/appengine/sendgrid/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/sendgrid/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml
index ad825e10799..e727adba001 100644
--- a/appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/static-files/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/static-files/src/main/webapp/WEB-INF/web.xml b/appengine/static-files/src/main/webapp/WEB-INF/web.xml
index e7fce53fed5..d79246cd9c1 100644
--- a/appengine/static-files/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/static-files/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java b/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java
index 7076b04fc3a..e0fbeaac062 100644
--- a/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java
+++ b/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 Google Inc.
  *
  * 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/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Worker.java b/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Worker.java
index 5bc298be1db..63c42af1d1d 100644
--- a/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Worker.java
+++ b/appengine/taskqueue-push/src/main/java/com/example/appengine/taskqueue/push/Worker.java
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 Google Inc.
  *
  * 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/appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml
index 878132f8813..deb910b815e 100644
--- a/appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/taskqueue-push/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     Copyright 2016 Google Inc. All Rights Reserved.
+     Copyright 2016 Google Inc.
 
  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/appengine/taskqueue-push/src/main/webapp/WEB-INF/web.xml b/appengine/taskqueue-push/src/main/webapp/WEB-INF/web.xml
index c7c7ab97bc4..b1ab8458b5b 100644
--- a/appengine/taskqueue-push/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/taskqueue-push/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     Copyright 2016 Google Inc. All Rights Reserved.
+     Copyright 2016 Google Inc.
 
  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/appengine/taskqueue-push/src/main/webapp/index.html b/appengine/taskqueue-push/src/main/webapp/index.html
index f03eaa5f8a8..edec84176f0 100644
--- a/appengine/taskqueue-push/src/main/webapp/index.html
+++ b/appengine/taskqueue-push/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/appengine/taskqueue-push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java b/appengine/taskqueue-push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java
index 9dec78c9700..2d82e3ee69d 100644
--- a/appengine/taskqueue-push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java
+++ b/appengine/taskqueue-push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 Google Inc.
  *
  * 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/appengine/taskqueue/pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java b/appengine/taskqueue/pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java
index 9bd4529eb3d..88aaefeed0d 100644
--- a/appengine/taskqueue/pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java
+++ b/appengine/taskqueue/pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/taskqueue/pull/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/appengine-web.xml
index c322e7d016e..0219c120504 100644
--- a/appengine/taskqueue/pull/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/taskqueue/pull/src/main/webapp/WEB-INF/logging.properties b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/logging.properties
index 972c03f5da9..b2d2797cada 100644
--- a/appengine/taskqueue/pull/src/main/webapp/WEB-INF/logging.properties
+++ b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/logging.properties
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 
 #  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/appengine/taskqueue/pull/src/main/webapp/WEB-INF/web.xml b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/web.xml
index 8bd4347131c..807f08387c2 100644
--- a/appengine/taskqueue/pull/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/taskqueue/pull/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/taskqueue/pull/src/main/webapp/tasks.jsp b/appengine/taskqueue/pull/src/main/webapp/tasks.jsp
index 1e8263b17c4..02f12a901dc 100644
--- a/appengine/taskqueue/pull/src/main/webapp/tasks.jsp
+++ b/appengine/taskqueue/pull/src/main/webapp/tasks.jsp
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
index 1332a62b08f..1e5aabda0cf 100644
--- a/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
+++ b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
index cd99f8f083c..aa7bb6db308 100644
--- a/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
+++ b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java b/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
index da6ecb0c941..6cb0c30a46e 100644
--- a/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
+++ b/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
index 34cd5e0b3ad..ffb8546d95f 100644
--- a/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/twilio/src/main/webapp/WEB-INF/web.xml b/appengine/twilio/src/main/webapp/WEB-INF/web.xml
index 38e4ad35048..4791ebe69c4 100644
--- a/appengine/twilio/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/twilio/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- [START_EXCLUDE] -->
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/appengine/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java b/appengine/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java
index 374db62bb07..f0052655408 100644
--- a/appengine/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java
+++ b/appengine/urlfetch/src/main/java/com/example/appengine/UrlFetchServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/appengine/urlfetch/src/main/webapp/main.jsp b/appengine/urlfetch/src/main/webapp/main.jsp
index 7e16a58d092..a4967094874 100644
--- a/appengine/urlfetch/src/main/webapp/main.jsp
+++ b/appengine/urlfetch/src/main/webapp/main.jsp
@@ -1,5 +1,5 @@
 <%--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
 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/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java b/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java
index cd976a1820c..d654fc78384 100644
--- a/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java
+++ b/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java
@@ -1,4 +1,4 @@
-/* Copyright 2016 Google Inc. All Rights Reserved.
+/* Copyright 2016 Google Inc.
  *
  * 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/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java b/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java
index b710ae737d0..ffc0a74785a 100644
--- a/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java
+++ b/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/bigquery/cloud-client/pom.xml b/bigquery/cloud-client/pom.xml
index 091d06a1375..5a474d6b273 100644
--- a/bigquery/cloud-client/pom.xml
+++ b/bigquery/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/compute/cmdline/pom.xml b/compute/cmdline/pom.xml
index 39ff3628d90..04a86b9c5fb 100644
--- a/compute/cmdline/pom.xml
+++ b/compute/cmdline/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
 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/compute/cmdline/src/main/java/ComputeEngineSample.java b/compute/cmdline/src/main/java/ComputeEngineSample.java
index 836097a1c2e..82a2d70654b 100644
--- a/compute/cmdline/src/main/java/ComputeEngineSample.java
+++ b/compute/cmdline/src/main/java/ComputeEngineSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/compute/error-reporting/pom.xml b/compute/error-reporting/pom.xml
index e83c70544b2..417d09dfd26 100644
--- a/compute/error-reporting/pom.xml
+++ b/compute/error-reporting/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/compute/error-reporting/src/main/java/com/example/compute/errorreporting/ExceptionUtil.java b/compute/error-reporting/src/main/java/com/example/compute/errorreporting/ExceptionUtil.java
index e2a0fe4f272..3df529afe51 100644
--- a/compute/error-reporting/src/main/java/com/example/compute/errorreporting/ExceptionUtil.java
+++ b/compute/error-reporting/src/main/java/com/example/compute/errorreporting/ExceptionUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/compute/mailjet/pom.xml b/compute/mailjet/pom.xml
index a5e4d9c6bcf..ba0fd0a66f7 100644
--- a/compute/mailjet/pom.xml
+++ b/compute/mailjet/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java b/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java
index fc39c511333..5d469c8bc43 100644
--- a/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java
+++ b/compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/compute/mailjet/src/test/java/com/example/compute/mailjet/MailjetSenderTest.java b/compute/mailjet/src/test/java/com/example/compute/mailjet/MailjetSenderTest.java
index 6212a05aa10..3a181d221eb 100644
--- a/compute/mailjet/src/test/java/com/example/compute/mailjet/MailjetSenderTest.java
+++ b/compute/mailjet/src/test/java/com/example/compute/mailjet/MailjetSenderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java b/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java
index 6c98fd8d8cb..03285bd1e0f 100644
--- a/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java
+++ b/compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/datastore/src/main/java/com/google/datastore/snippets/TaskList.java b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
index 1482e0784ba..43af1c2e0d2 100644
--- a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
+++ b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index 8970e83e2ba..b388e657d26 100644
--- a/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/endpoints/bookstore-grpc/api/build.gradle b/endpoints/bookstore-grpc/api/build.gradle
index f8331ff246b..140900941b5 100644
--- a/endpoints/bookstore-grpc/api/build.gradle
+++ b/endpoints/bookstore-grpc/api/build.gradle
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/api/src/main/proto/bookstore.proto b/endpoints/bookstore-grpc/api/src/main/proto/bookstore.proto
index c3f685f1a0c..838c5302e81 100644
--- a/endpoints/bookstore-grpc/api/src/main/proto/bookstore.proto
+++ b/endpoints/bookstore-grpc/api/src/main/proto/bookstore.proto
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/client/build.gradle b/endpoints/bookstore-grpc/client/build.gradle
index 2bc4d2d74b2..fcedbceec5a 100644
--- a/endpoints/bookstore-grpc/client/build.gradle
+++ b/endpoints/bookstore-grpc/client/build.gradle
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/client/src/main/java/com/google/endpoints/examples/bookstore/BookstoreClient.java b/endpoints/bookstore-grpc/client/src/main/java/com/google/endpoints/examples/bookstore/BookstoreClient.java
index 1ff9cd7a0ed..39cf0c540ea 100644
--- a/endpoints/bookstore-grpc/client/src/main/java/com/google/endpoints/examples/bookstore/BookstoreClient.java
+++ b/endpoints/bookstore-grpc/client/src/main/java/com/google/endpoints/examples/bookstore/BookstoreClient.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/server/build.gradle b/endpoints/bookstore-grpc/server/build.gradle
index b1245eae51f..76eab5b6740 100644
--- a/endpoints/bookstore-grpc/server/build.gradle
+++ b/endpoints/bookstore-grpc/server/build.gradle
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreData.java b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreData.java
index 95a04226a93..8f3c961260a 100644
--- a/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreData.java
+++ b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreData.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreServer.java b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreServer.java
index 6cd64a0f4ff..2a5c139df0a 100644
--- a/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreServer.java
+++ b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreServer.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreService.java b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreService.java
index f46cc87010c..97f666a3b8a 100644
--- a/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreService.java
+++ b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/BookstoreService.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/ShelfEntity.java b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/ShelfEntity.java
index 82ed11da7dd..f9764e311df 100644
--- a/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/ShelfEntity.java
+++ b/endpoints/bookstore-grpc/server/src/main/java/com/google/endpoints/examples/bookstore/ShelfEntity.java
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 // 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/endpoints/getting-started/container-engine.yaml b/endpoints/getting-started/container-engine.yaml
index bec789f3a26..718b8364648 100644
--- a/endpoints/getting-started/container-engine.yaml
+++ b/endpoints/getting-started/container-engine.yaml
@@ -1,4 +1,4 @@
-# Copyright 2015 Google Inc. All Rights Reserved.
+# Copyright 2015 Google Inc.
 #
 # 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/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java b/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java
index 4ed7ba4a813..88cc789bf19 100644
--- a/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java
+++ b/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/endpoints/getting-started/src/main/java/com/example/endpoints/EchoServlet.java b/endpoints/getting-started/src/main/java/com/example/endpoints/EchoServlet.java
index 40e0f1f5038..729d14e7687 100644
--- a/endpoints/getting-started/src/main/java/com/example/endpoints/EchoServlet.java
+++ b/endpoints/getting-started/src/main/java/com/example/endpoints/EchoServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/analytics/pom.xml b/flexible/analytics/pom.xml
index 8ac8cbd63ca..ede4af06a43 100644
--- a/flexible/analytics/pom.xml
+++ b/flexible/analytics/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java b/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java
index d451a799629..200b593bd31 100644
--- a/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java
+++ b/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/async-rest/pom.xml b/flexible/async-rest/pom.xml
index bc9c17834c8..121d083b84c 100644
--- a/flexible/async-rest/pom.xml
+++ b/flexible/async-rest/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/flexible/async-rest/src/main/appengine/app.yaml b/flexible/async-rest/src/main/appengine/app.yaml
index 378f5b9dbce..4206cff71b2 100644
--- a/flexible/async-rest/src/main/appengine/app.yaml
+++ b/flexible/async-rest/src/main/appengine/app.yaml
@@ -1,4 +1,4 @@
-#  Copyright 2016 Google Inc. All Rights Reserved.
+#  Copyright 2016 Google Inc.
 #
 #  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/flexible/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
index 8f99971f8b3..7907f5207cc 100644
--- a/flexible/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
+++ b/flexible/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java
index 51a3e49b096..101e511245b 100644
--- a/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java
+++ b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java
index 571752ea08d..712e3587cd8 100644
--- a/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java
+++ b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java
index 19d3bed254b..9717300e340 100644
--- a/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java
+++ b/flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml
index 136b44799ca..1189db81d20 100644
--- a/flexible/cloudstorage/pom.xml
+++ b/flexible/cloudstorage/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java b/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java
index 6223073be4e..6b7aebb0d8b 100644
--- a/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java
+++ b/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/cron/pom.xml b/flexible/cron/pom.xml
index f66fcf2e908..1053175a8ac 100644
--- a/flexible/cron/pom.xml
+++ b/flexible/cron/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/cron/src/main/java/com/example/cron/CronServlet.java b/flexible/cron/src/main/java/com/example/cron/CronServlet.java
index 998e013b2e2..1ef6dcbfc41 100644
--- a/flexible/cron/src/main/java/com/example/cron/CronServlet.java
+++ b/flexible/cron/src/main/java/com/example/cron/CronServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/flexible/datastore/pom.xml b/flexible/datastore/pom.xml
index 3f89936516b..3046d50d48e 100644
--- a/flexible/datastore/pom.xml
+++ b/flexible/datastore/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/datastore/src/main/appengine/app.yaml b/flexible/datastore/src/main/appengine/app.yaml
index c84d3698432..da7604717b7 100644
--- a/flexible/datastore/src/main/appengine/app.yaml
+++ b/flexible/datastore/src/main/appengine/app.yaml
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java b/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java
index ef9822cd1f8..e4c02b338a2 100644
--- a/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java
+++ b/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/disk/pom.xml b/flexible/disk/pom.xml
index 88dd81d9c3a..ba69f28749c 100644
--- a/flexible/disk/pom.xml
+++ b/flexible/disk/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/disk/src/main/java/com/example/disk/DiskServlet.java b/flexible/disk/src/main/java/com/example/disk/DiskServlet.java
index 24c0e5b027a..5434063c309 100644
--- a/flexible/disk/src/main/java/com/example/disk/DiskServlet.java
+++ b/flexible/disk/src/main/java/com/example/disk/DiskServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java
index 4ed7ba4a813..88cc789bf19 100644
--- a/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java
+++ b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/endpoints/src/main/java/com/example/endpoints/EchoServlet.java b/flexible/endpoints/src/main/java/com/example/endpoints/EchoServlet.java
index 40e0f1f5038..729d14e7687 100644
--- a/flexible/endpoints/src/main/java/com/example/endpoints/EchoServlet.java
+++ b/flexible/endpoints/src/main/java/com/example/endpoints/EchoServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/extending-runtime/pom.xml b/flexible/extending-runtime/pom.xml
index 6a1fb31890d..1d4a53209e3 100644
--- a/flexible/extending-runtime/pom.xml
+++ b/flexible/extending-runtime/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java b/flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java
index 3b232db2d74..9e43738563a 100644
--- a/flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java
+++ b/flexible/extending-runtime/src/main/java/com/example/extendingruntime/FortuneServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/helloworld/build.gradle b/flexible/helloworld/build.gradle
index c755997a2b1..43e91fe617a 100644
--- a/flexible/helloworld/build.gradle
+++ b/flexible/helloworld/build.gradle
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc.
 //
 //  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/flexible/helloworld/pom.xml b/flexible/helloworld/pom.xml
index 08a8be9ce86..3c43fb9a9f1 100644
--- a/flexible/helloworld/pom.xml
+++ b/flexible/helloworld/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/helloworld/src/main/appengine/app.yaml b/flexible/helloworld/src/main/appengine/app.yaml
index 69a35b4caf3..13e75b3fa51 100644
--- a/flexible/helloworld/src/main/appengine/app.yaml
+++ b/flexible/helloworld/src/main/appengine/app.yaml
@@ -1,4 +1,4 @@
-#  Copyright 2016 Google Inc. All Rights Reserved.
+#  Copyright 2016 Google Inc.
 #
 #  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/flexible/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java b/flexible/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java
index b332fdf88c1..e15d13a91af 100644
--- a/flexible/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java
+++ b/flexible/helloworld/src/main/java/com/example/flexible/helloworld/HelloServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/mailgun/pom.xml b/flexible/mailgun/pom.xml
index e852ba7f9ff..d624b1ca4c9 100644
--- a/flexible/mailgun/pom.xml
+++ b/flexible/mailgun/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java b/flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java
index 304cd05f917..d5845190013 100644
--- a/flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java
+++ b/flexible/mailgun/src/main/java/com/example/mailgun/MailgunServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/mailjet/pom.xml b/flexible/mailjet/pom.xml
index 75ff8a9a377..a12be479917 100644
--- a/flexible/mailjet/pom.xml
+++ b/flexible/mailjet/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
index b8723834431..72efc229545 100644
--- a/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
+++ b/flexible/mailjet/src/main/java/com/example/mailjet/MailjetServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/flexible/mailjet/src/main/webapp/index.html b/flexible/mailjet/src/main/webapp/index.html
index 5b7cc9a3ee6..4827faac07b 100644
--- a/flexible/mailjet/src/main/webapp/index.html
+++ b/flexible/mailjet/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <!--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
diff --git a/flexible/memcache/pom.xml b/flexible/memcache/pom.xml
index a1c13b42593..4da8e2ca533 100644
--- a/flexible/memcache/pom.xml
+++ b/flexible/memcache/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/memcache/src/main/java/com/example/memcache/MemcacheServlet.java b/flexible/memcache/src/main/java/com/example/memcache/MemcacheServlet.java
index ad46b2437bd..4621d91f3ca 100644
--- a/flexible/memcache/src/main/java/com/example/memcache/MemcacheServlet.java
+++ b/flexible/memcache/src/main/java/com/example/memcache/MemcacheServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/sendgrid/pom.xml b/flexible/sendgrid/pom.xml
index 04ea5244c69..1eeea7f01ad 100644
--- a/flexible/sendgrid/pom.xml
+++ b/flexible/sendgrid/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/sendgrid/src/main/java/com/example/sendgrid/SendEmailServlet.java b/flexible/sendgrid/src/main/java/com/example/sendgrid/SendEmailServlet.java
index cfbd0232d04..cc8e0bdf1cb 100644
--- a/flexible/sendgrid/src/main/java/com/example/sendgrid/SendEmailServlet.java
+++ b/flexible/sendgrid/src/main/java/com/example/sendgrid/SendEmailServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
index 218733eb6fc..4fb571c0569 100644
--- a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
+++ b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
+ * Copyright (c) 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You may
diff --git a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
index d01e1556453..d5d6dc5c107 100644
--- a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
+++ b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/ResponseError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
+ * Copyright (c) 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You may
diff --git a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
index 44969b40fbb..770fdc23b71 100644
--- a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
+++ b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
+ * Copyright (c) 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You may
diff --git a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
index 0a4b303250c..64be0be8958 100644
--- a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
+++ b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
+ * Copyright (c) 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You may
diff --git a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
index f7dd3bd0376..46dc4f5fdf0 100644
--- a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
+++ b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
+ * Copyright (c) 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You may
diff --git a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
index 3b02cc7c3fe..39e37bdc068 100644
--- a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
+++ b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
+ * Copyright (c) 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You may
diff --git a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
index 67a3735ff6b..687bbae86cf 100644
--- a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
+++ b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc. All Rights Reserved.
+ * Copyright (c) 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you
  * may not use this file except in compliance with the License. You may
diff --git a/flexible/static-files/pom.xml b/flexible/static-files/pom.xml
index 3ee8834248f..93cb679f1f1 100644
--- a/flexible/static-files/pom.xml
+++ b/flexible/static-files/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/twilio/pom.xml b/flexible/twilio/pom.xml
index 0a102812c08..22c92770a78 100644
--- a/flexible/twilio/pom.xml
+++ b/flexible/twilio/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/flexible/twilio/src/main/java/com/example/twilio/ReceiveCallServlet.java b/flexible/twilio/src/main/java/com/example/twilio/ReceiveCallServlet.java
index 9fb115f9ab1..83c099cda42 100644
--- a/flexible/twilio/src/main/java/com/example/twilio/ReceiveCallServlet.java
+++ b/flexible/twilio/src/main/java/com/example/twilio/ReceiveCallServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/twilio/src/main/java/com/example/twilio/ReceiveSmsServlet.java b/flexible/twilio/src/main/java/com/example/twilio/ReceiveSmsServlet.java
index 5a47ea3b303..6868040e7eb 100644
--- a/flexible/twilio/src/main/java/com/example/twilio/ReceiveSmsServlet.java
+++ b/flexible/twilio/src/main/java/com/example/twilio/ReceiveSmsServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/flexible/twilio/src/main/java/com/example/twilio/SendSmsServlet.java b/flexible/twilio/src/main/java/com/example/twilio/SendSmsServlet.java
index ae0af6c6564..7371124dd8e 100644
--- a/flexible/twilio/src/main/java/com/example/twilio/SendSmsServlet.java
+++ b/flexible/twilio/src/main/java/com/example/twilio/SendSmsServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/language/analysis/demo.cmd b/language/analysis/demo.cmd
index faf44778ba0..91b867d8477 100644
--- a/language/analysis/demo.cmd
+++ b/language/analysis/demo.cmd
@@ -1,8 +1,8 @@
 :
 : Demonstrates how to run the Analyze sample.
 :#########################################################################
-
-: Copyright 2016 Google Inc. All Rights Reserved.
+
+: Copyright 2016 Google Inc.
 :
 : Licensed under the Apache License, Version 2.0 (the "License"); 
 : you may not use this file except in compliance with the License.  
@@ -14,7 +14,7 @@
 : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 : See the License for the specific language governing permissions and
 : limitations under the License.
-:#########################################################################
+:#########################################################################
 
 
 :call:run_nl entities "The quick brown fox jumped over the lazy dog."
@@ -40,7 +40,8 @@ EXIT /B
 
 :###################################### 
 : Exercises the sample code on various example text and GCS objects.  
-: Globals:
 
+: Globals:
+ 
 :   None 
 : Arguments: 
 :   None 
diff --git a/language/analysis/demo.sh b/language/analysis/demo.sh
index 043bee0e5ad..513c8e8ae04 100755
--- a/language/analysis/demo.sh
+++ b/language/analysis/demo.sh
@@ -3,7 +3,7 @@
 # Demonstrates how to run the Analyze sample.
 
 ##########################################################################
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/language/analysis/pom.xml b/language/analysis/pom.xml
index 6d6d8db393e..75a689f1fc0 100644
--- a/language/analysis/pom.xml
+++ b/language/analysis/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
 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/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
index 0d6ae43601d..06db78bafe6 100644
--- a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
+++ b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
index 4775a4a720a..43a5b19e47a 100644
--- a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
+++ b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
index a1a13c1c032..de14f4f1b1e 100644
--- a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
+++ b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/language/cloud-client/pom.xml b/language/cloud-client/pom.xml
index f1dfdd900bf..930d55e8de8 100644
--- a/language/cloud-client/pom.xml
+++ b/language/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/logging/cloud-client/pom.xml b/logging/cloud-client/pom.xml
index dc98e9059c6..91ed47a8ba6 100644
--- a/logging/cloud-client/pom.xml
+++ b/logging/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/logging/src/test/java/ListLogsTest.java b/logging/src/test/java/ListLogsTest.java
index ee94330c394..45efec69444 100644
--- a/logging/src/test/java/ListLogsTest.java
+++ b/logging/src/test/java/ListLogsTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java b/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java
index 66fcb481587..b02aca0611b 100644
--- a/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java
+++ b/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/monitoring/v2/src/test/java/CloudMonitoringAuthSampleTest.java b/monitoring/v2/src/test/java/CloudMonitoringAuthSampleTest.java
index 4af0e1c0a1f..c1bdadc4d55 100644
--- a/monitoring/v2/src/test/java/CloudMonitoringAuthSampleTest.java
+++ b/monitoring/v2/src/test/java/CloudMonitoringAuthSampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/monitoring/v3/src/main/java/CreateCustomMetric.java b/monitoring/v3/src/main/java/CreateCustomMetric.java
index 5b0def17b8f..fa7dfd2bfb7 100644
--- a/monitoring/v3/src/main/java/CreateCustomMetric.java
+++ b/monitoring/v3/src/main/java/CreateCustomMetric.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/monitoring/v3/src/main/java/ListResources.java b/monitoring/v3/src/main/java/ListResources.java
index 859e635f7c9..818b95a9a24 100644
--- a/monitoring/v3/src/main/java/ListResources.java
+++ b/monitoring/v3/src/main/java/ListResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/monitoring/v3/src/test/java/CreateCustomMetricTest.java b/monitoring/v3/src/test/java/CreateCustomMetricTest.java
index 301d08ed741..26dc57e5b97 100644
--- a/monitoring/v3/src/test/java/CreateCustomMetricTest.java
+++ b/monitoring/v3/src/test/java/CreateCustomMetricTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/monitoring/v3/src/test/java/ListResourcesTest.java b/monitoring/v3/src/test/java/ListResourcesTest.java
index 7a03548b08c..211dbd80837 100644
--- a/monitoring/v3/src/test/java/ListResourcesTest.java
+++ b/monitoring/v3/src/test/java/ListResourcesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml
index 68a50196481..b0717ceda42 100644
--- a/pubsub/cloud-client/pom.xml
+++ b/pubsub/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/storage/cloud-client/pom.xml b/storage/cloud-client/pom.xml
index c7890301fce..6722813d5a0 100644
--- a/storage/cloud-client/pom.xml
+++ b/storage/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/storage/json-api/pom.xml b/storage/json-api/pom.xml
index e9c61d63469..7f9315478f3 100644
--- a/storage/json-api/pom.xml
+++ b/storage/json-api/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  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/storage/json-api/src/main/java/CustomerSuppliedEncryptionKeysSamples.java b/storage/json-api/src/main/java/CustomerSuppliedEncryptionKeysSamples.java
index 05a9cf55190..5d526222d81 100644
--- a/storage/json-api/src/main/java/CustomerSuppliedEncryptionKeysSamples.java
+++ b/storage/json-api/src/main/java/CustomerSuppliedEncryptionKeysSamples.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/storage/json-api/src/main/java/StorageFactory.java b/storage/json-api/src/main/java/StorageFactory.java
index ea91b414b90..b487edd9c53 100644
--- a/storage/json-api/src/main/java/StorageFactory.java
+++ b/storage/json-api/src/main/java/StorageFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/storage/json-api/src/main/java/StorageUtils.java b/storage/json-api/src/main/java/StorageUtils.java
index 71370a6032c..6ef874666ea 100644
--- a/storage/json-api/src/main/java/StorageUtils.java
+++ b/storage/json-api/src/main/java/StorageUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/storage/json-api/src/test/java/StorageSampleTest.java b/storage/json-api/src/test/java/StorageSampleTest.java
index 55c17aa2830..307fb60b71c 100644
--- a/storage/json-api/src/test/java/StorageSampleTest.java
+++ b/storage/json-api/src/test/java/StorageSampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml
index e80a9316ba2..fec130af904 100644
--- a/storage/storage-transfer/pom.xml
+++ b/storage/storage-transfer/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2015 Google Inc. All Rights Reserved.
+  ~ Copyright (c) 2015 Google Inc.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License"); you
   ~ may not use this file except in compliance with the License. You may
diff --git a/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java
index e49c5fd324f..6feefa79662 100644
--- a/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java
+++ b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/AwsRequester.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java
index c2f4be1c79a..b7d89640732 100644
--- a/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java
+++ b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/NearlineRequester.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java
index 826fef4b97e..6de18a12aa5 100644
--- a/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java
+++ b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RequestChecker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java
index c035e4a808e..6d202c5e095 100644
--- a/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java
+++ b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/RetryHttpInitializerWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java
index 320d3a37a06..769fdb6b962 100644
--- a/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java
+++ b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferClientCreator.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java
index 5210f43193f..0fdd94d7d02 100644
--- a/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java
+++ b/storage/storage-transfer/src/main/java/com/google/cloud/storage/storagetransfer/samples/TransferJobUtils.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java
index 395687d54c8..911af55ba25 100644
--- a/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java
+++ b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/AwsRequesterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java
index 21118e80df9..7fb9bc05428 100644
--- a/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java
+++ b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/NearlineRequesterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java
index 0404962885d..6f48ae2ff3a 100644
--- a/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java
+++ b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/RequestCheckerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java
index bdb4197c92f..9306545c387 100644
--- a/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java
+++ b/storage/storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/TransferJobUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml
index 29cc30c4af5..04bccd40609 100644
--- a/storage/xml-api/cmdline-sample/pom.xml
+++ b/storage/xml-api/cmdline-sample/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java b/storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java
index 8d9343f6c6b..0537f8bd08a 100644
--- a/storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java
+++ b/storage/xml-api/cmdline-sample/src/test/java/StorageSampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/taskqueue/deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java b/taskqueue/deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java
index 97d59f31977..82e9057f2da 100644
--- a/taskqueue/deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java
+++ b/taskqueue/deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/taskqueue/deferred/src/main/webapp/WEB-INF/appengine-web.xml b/taskqueue/deferred/src/main/webapp/WEB-INF/appengine-web.xml
index 6d4b396b5bb..40a4d8b08a7 100644
--- a/taskqueue/deferred/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/taskqueue/deferred/src/main/webapp/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
   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/taskqueue/deferred/src/main/webapp/WEB-INF/web.xml b/taskqueue/deferred/src/main/webapp/WEB-INF/web.xml
index 81cc85ee959..a8b724b5871 100644
--- a/taskqueue/deferred/src/main/webapp/WEB-INF/web.xml
+++ b/taskqueue/deferred/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
   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/taskqueue/deferred/src/main/webapp/guestbook.jsp b/taskqueue/deferred/src/main/webapp/guestbook.jsp
index 13097933e3e..52530b8fef0 100644
--- a/taskqueue/deferred/src/main/webapp/guestbook.jsp
+++ b/taskqueue/deferred/src/main/webapp/guestbook.jsp
@@ -1,5 +1,5 @@
 <%--
-  Copyright 2015 Google Inc. All Rights Reserved.
+  Copyright 2015 Google Inc.
 
   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/taskqueue/pull/pom.xml b/taskqueue/pull/pom.xml
index dffcdf88190..d7217343837 100644
--- a/taskqueue/pull/pom.xml
+++ b/taskqueue/pull/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/taskqueue/pull/src/main/java/TaskQueueSample.java b/taskqueue/pull/src/main/java/TaskQueueSample.java
index 5268df52a67..de9c7bd39a3 100644
--- a/taskqueue/pull/src/main/java/TaskQueueSample.java
+++ b/taskqueue/pull/src/main/java/TaskQueueSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/translate/src/main/java/com/example/cloud/translate/samples/TranslateText.java b/translate/src/main/java/com/example/cloud/translate/samples/TranslateText.java
index 9870793a2aa..b5454b0687d 100644
--- a/translate/src/main/java/com/example/cloud/translate/samples/TranslateText.java
+++ b/translate/src/main/java/com/example/cloud/translate/samples/TranslateText.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/translate/src/test/java/com/example/cloud/translate/samples/TranslateTextTest.java b/translate/src/test/java/com/example/cloud/translate/samples/TranslateTextTest.java
index c0f6edb4afc..4d943a59fd8 100644
--- a/translate/src/test/java/com/example/cloud/translate/samples/TranslateTextTest.java
+++ b/translate/src/test/java/com/example/cloud/translate/samples/TranslateTextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/travis.sh b/travis.sh
index dcadb947760..713c32a8493 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2016 Google Inc. All Rights Reserved.
+# Copyright 2016 Google Inc.
 #
 # 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/unittests/src/test/java/com/google/appengine/samples/AuthenticationTest.java b/unittests/src/test/java/com/google/appengine/samples/AuthenticationTest.java
index 5ef8f133693..c300702fb20 100644
--- a/unittests/src/test/java/com/google/appengine/samples/AuthenticationTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/AuthenticationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/DeferredTaskTest.java b/unittests/src/test/java/com/google/appengine/samples/DeferredTaskTest.java
index d96bd974fe2..3477305210e 100644
--- a/unittests/src/test/java/com/google/appengine/samples/DeferredTaskTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/DeferredTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/LocalCustomPolicyHighRepDatastoreTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalCustomPolicyHighRepDatastoreTest.java
index 59246c5341b..ef889c7579e 100644
--- a/unittests/src/test/java/com/google/appengine/samples/LocalCustomPolicyHighRepDatastoreTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/LocalCustomPolicyHighRepDatastoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/LocalDatastoreTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalDatastoreTest.java
index 6e2e0185090..2b451c8d65b 100644
--- a/unittests/src/test/java/com/google/appengine/samples/LocalDatastoreTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/LocalDatastoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/LocalHighRepDatastoreTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalHighRepDatastoreTest.java
index 62f6bd05883..8d696ad21d4 100644
--- a/unittests/src/test/java/com/google/appengine/samples/LocalHighRepDatastoreTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/LocalHighRepDatastoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/LocalMemcacheTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalMemcacheTest.java
index 8950dc67a92..39186086cc2 100644
--- a/unittests/src/test/java/com/google/appengine/samples/LocalMemcacheTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/LocalMemcacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/LocalUrlFetchTest.java b/unittests/src/test/java/com/google/appengine/samples/LocalUrlFetchTest.java
index a2f1eba6c67..b0e616f721e 100644
--- a/unittests/src/test/java/com/google/appengine/samples/LocalUrlFetchTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/LocalUrlFetchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/MyFirstTest.java b/unittests/src/test/java/com/google/appengine/samples/MyFirstTest.java
index 25aa98c6728..f60eed48e1c 100644
--- a/unittests/src/test/java/com/google/appengine/samples/MyFirstTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/MyFirstTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/ShortTest.java b/unittests/src/test/java/com/google/appengine/samples/ShortTest.java
index 071b004db4e..a024c08bcd3 100644
--- a/unittests/src/test/java/com/google/appengine/samples/ShortTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/ShortTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/TaskQueueConfigTest.java b/unittests/src/test/java/com/google/appengine/samples/TaskQueueConfigTest.java
index a3ac7a3d6e4..84e5d91b15f 100644
--- a/unittests/src/test/java/com/google/appengine/samples/TaskQueueConfigTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/TaskQueueConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/unittests/src/test/java/com/google/appengine/samples/TaskQueueTest.java b/unittests/src/test/java/com/google/appengine/samples/TaskQueueTest.java
index cd03d1fb6c4..3616fb035e2 100644
--- a/unittests/src/test/java/com/google/appengine/samples/TaskQueueTest.java
+++ b/unittests/src/test/java/com/google/appengine/samples/TaskQueueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 Google Inc.
  *
  * 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/vision/cloud-client/pom.xml b/vision/cloud-client/pom.xml
index af88fea2d2c..3f744ea2f34 100644
--- a/vision/cloud-client/pom.xml
+++ b/vision/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2017 Google Inc. All Rights Reserved.
+  Copyright 2017 Google Inc.
 
   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/vision/face-detection/pom.xml b/vision/face-detection/pom.xml
index c608b38ff8d..6002e53e8df 100644
--- a/vision/face-detection/pom.xml
+++ b/vision/face-detection/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java b/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java
index 1ab1707c4a9..67d9999de53 100644
--- a/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java
+++ b/vision/face-detection/src/main/java/com/google/cloud/vision/samples/facedetect/FaceDetectApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppIT.java b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppIT.java
index 50d33701fd2..fadc06abb63 100644
--- a/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppIT.java
+++ b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java
index 8c843dcad29..24642005273 100644
--- a/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java
+++ b/vision/face-detection/src/test/java/com/google/cloud/vision/samples/facedetect/FaceDetectAppTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/label/pom.xml b/vision/label/pom.xml
index f53607a23ef..e907eb34608 100644
--- a/vision/label/pom.xml
+++ b/vision/label/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java b/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java
index 74d8dfd49a9..fd4b62233e8 100644
--- a/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java
+++ b/vision/label/src/main/java/com/google/cloud/vision/samples/label/LabelApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java
index ee60e60603c..17886c77432 100644
--- a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java
+++ b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java
index b6f54653801..6a238a3d248 100644
--- a/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java
+++ b/vision/label/src/test/java/com/google/cloud/vision/samples/label/LabelAppTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/landmark-detection/pom.xml b/vision/landmark-detection/pom.xml
index 967cc9f7a7b..bd9a4f871ea 100644
--- a/vision/landmark-detection/pom.xml
+++ b/vision/landmark-detection/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java b/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java
index e1df29092d6..8274ed88f92 100644
--- a/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java
+++ b/vision/landmark-detection/src/main/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java b/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java
index f0f14c46c30..00aeef8b754 100644
--- a/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java
+++ b/vision/landmark-detection/src/test/java/com/google/cloud/vision/samples/landmarkdetection/DetectLandmarkIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/text/pom.xml b/vision/text/pom.xml
index 61fe0cb7404..e0afb03a8b7 100644
--- a/vision/text/pom.xml
+++ b/vision/text/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   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/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppIT.java b/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppIT.java
index 2e1867ebe7e..1b311d9db64 100644
--- a/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppIT.java
+++ b/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * 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/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppTest.java b/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppTest.java
index 9ada8e0ad7f..bd197cc54c7 100644
--- a/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppTest.java
+++ b/vision/text/src/test/java/com/google/cloud/vision/samples/text/TextAppTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.