Merge "Fix javadoc xrefs." into pi-dev