Merge "Improve the javadoc for cross profile calendar uris."