Merge "Improve camera javadoc and fix some errors." into ics-mr0