Misc. copyright updates but not to license

Change-Id: Ibb04d1a96914806db671e1ad4ed16def95cb7b44