Merge "Fixed year on copyright notice." into nyc-mr1-dev
am: 7aed32ac3d

Change-Id: I41544cbe05505de72024470916acadb4ca65a8c0