am 4b901c45: Merge "Fix docs to not refer to non-public classes." into mnc-dev

* commit '4b901c4506d495c0cbcad316e38797c6522e88d0':
  Fix docs to not refer to non-public classes.