Add missing includes. am: 06c7a6f3cd
am: 8c5d732479

Change-Id: I20797748a9b3d9100b8c1f06e91bc585270f8433