Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev