Merge package private interfaces into public ones.

- Related: #1989 and #1991