Merge "Fix transitive include." into oc-dev am: fb1763bf3c
am: e148197eda

Change-Id: Ib727b7dffae1aa5549c6ca2e3907390f24a9ad15