Merge "Fix @see to external class in api to allow compilation with Java 8"