am 566e78d9: am 5e6944bc: am e4e6c97e: am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev

* commit '566e78d9f7d2451d964b06a1a9842e72204e6689':