Merge "Add missing copyright messages" am: 872f386f6b am: 32a1dc5075
am: cf4d62fdd3

Change-Id: I75f2c81a9e7c7ec0175e50b3bb58cedc8c36a2be