Updated javadoc copyright years.

Change-Id: I56c8d6d34af90d0dc8ca605b62ebfe5ad95a4e5e
Merge changes from origin/7.2

591996b Updated javadoc copyright years.

Change-Id: I50856e97c276b6a6c073be34b6f4faf042e7fab6