am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...

* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
  Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...