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

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