Merge "Fix javadocs." into gingerbread