am 7f8ebb81: am 30291f21: Merge "Add missing headers"

* commit '7f8ebb8178cd6a3d9ea0206070682a9b463f15d2':
  Add missing headers