Merge "Don't rely on transitively included headers" am: 1363159d74 am: 6d76606405 am: 873a4a5494
am: 888b1351c8

Change-Id: Ia966da521d9cbb41fa65895beb7dbbdeea12f644