Merge "Remove use of old API doc methods"