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

Change-Id: Ie756c4c96a12692dcc9b812066cf8f1d46946277