Merge "JavaDoc improvements as suggested by API council."