Merge "Removed uninformative comments (mostly auto-generated non-Javadoc comments)"