Merge "missing include files" am: 7bd85b4ae8
am: e9f0e75160

Change-Id: Id8fe02304a8d7bd35ddba34ca69983357f852aee