am e6917963: Merge "Add missing includes."

* commit 'e6917963bfc6e7c6e56458e2dffe2dd5851f9183':
  Add missing includes.