Merge "Fix docs to not refer to non-public classes." into mnc-dev