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

Change-Id: I94fea2ec7ccda037d1c3b689b161282325dcd47a