Merge "Add missing copyright messages"
am: 872f386f6b

Change-Id: If54622ff6ed84dca262a8e65deb44bacbfc5b280