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