Copyright header clean up

Change-Id: I85b14ae770f0e1e091bb7ad110623495e0c65136
Updated package assignments

Change-Id: Iec168190c4246dda4ff4807b25e59872924624dc