Merge "Fix broken javadoc links"
am: 5eae14aa54

Change-Id: I7f1ef96544450ae71af3b76783fcbdc7641a2d43