Merge "Update the copyright notice"
am: 3d34bfc45c

Change-Id: I35049e8526fb804ebfa6538318385ac2e5489232