Merge "Remove use of private API." into jb-mr1-dev