Merge "Fix some unmatched javadoc tags." into honeycomb