am c534e7f3: am 05e3dc51: Merge "Add missing includes."

* commit 'c534e7f374147a02b68d240d415a302f33727f91':
  Add missing includes.