am 42b5e6d4: am 51bfedd8: Merge "Add missing includes."

* commit '42b5e6d49c92c3ec89fec7c68438a61e9e021e72':
  Add missing includes.