Merge "Improve javadoc for cross-profile calendar."