Merge "Avoid mentioning hidden API in docs." into jb-mr1-dev