Merge "Create separate interface for oem hook."