Merge "Add some backup Javadoc and clean imports"