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

Change-Id: Ifd346833e37b3fb3e8291c132a2a393ad052fb37