Merge "Add missing copyright headers" into oc-dev am: aef267d345

Change-Id: I73984a0d2700bf85e6b4bd31db42ee8dc50ea788