Merge "Fix documentation - non-public API."