Merge "Unused API should be hidden." into jb-dev