am 7f17aea2: Merge "Add missing includes."

* commit '7f17aea2fc21aaf657824a023a4b7582fb74a2d9':
  Add missing includes.