am 22669b72: Merge "Add missing includes."

* commit '22669b72523d4aee0f5756515c42df82ed67eda7':
  Add missing includes.