am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1

* commit '4ed072f904b5344ce4ef6f832c618a1d3f43867d':
  Add missing copyright headers to a couple of files