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

Change-Id: I0325773d80680928d47750937e2f4bc6a69b1bf9