Update copyright headers
Merge branch 'origin/varun' into chaudhary