Merge "Don't rely on transitively included headers" am: 45eeea2dcd am: 18e92a5495
am: f89ee4038e

Change-Id: I4f1457203642e73a6e8e9d831661ebf1f940cf63