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

Change-Id: Id6e6e5225ec2fec781585340b0368b6a46fc8aa7