Merge "Fixed incompatibility with interfaces" into oc-dr1-dev
am: 313f31003b

Change-Id: I3c04f997b39c8097965d399fb46c433417fbbfa8