Merge "Make interfaces protected so they get included in api"