Merge "Fix broken javadoc links" am: 5eae14aa54 am: 2c8c5928ab
am: dc72c37926

Change-Id: Iffb9cfe0928ed37db61a7f684acb2b41b74c1bfa