Merge "Fix transitive includes." into oc-dev
am: 6f5d1945a3

Change-Id: I372e8f95f2cf02137c6140719ab59b08351cae2d