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

Change-Id: I114acfe39b25d58f06072adfaf8613b7cb4f8404