Merge "Fix javadoc HTML escaping."