Merge "Fix transitive includes." into oc-dev am: 6f5d1945a3
am: 0f33583b36  -s ours

Change-Id: I0dd636881708f664493484733df55e2b83dafb75