[automerger skipped] Merge "Add missing copyright headers" into oc-dev am: aef267d345 am: b91ef1fd4d -s ours
am skip reason: Change-Id I1738a6b9ea1edfd539d21f9c2092b87d5cdd0d37 with SHA-1 073991f2ee is in history

Change-Id: Icfb39aac04303619777d6ac214a7d89ed05777ab