Fixed resetting link target and updated javadoc (#10543)

Change-Id: I91d0eb553542b5f65fb8ab25c3fc357272d87a74