am e78292f2: am cef3508b: Merge "Add missing includes."

* commit 'e78292f2c5a1cffd9fdcb76e5be29f6d14445b93':
  Add missing includes.