Merge Javadoc updates from 1.0.x repo.