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