Merge "Update the copyright notice" am: 3d34bfc45c am: f2f12dddb3

Change-Id: Ice6011e2a3a0e22c50759a6cf7c200fb885dcdb1