[automerger skipped] Merge "Fix last broken @see links in aosp." am: f38cb36032 -s ours

am skip reason: Change-Id Ib2e4360493275b79c72487ee1cb173bb5e0fd35f with SHA-1 2e5f38e0bf is in history

Change-Id: I58f1259edb62959f6e0ce542b5ea10bc7e040710