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