Merge "Improve camera javadoc."