Merge "Fix javadoc link for SDK build breakage"