Merge "Fix docs to refer to the correct class." into jb-mr1-dev