Merge "Add missing includes." am: 0c24d6ccea am: d166904f30
am: 2ad44ea5fd  -s ours

Change-Id: If72a6d1460a3d520639ed0cea6f2dcb7875b966e