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

Change-Id: I11b097faac8eb82c3672b18fe2ad581964cd3023