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

Change-Id: I6423d51b19dd70a3e8a35841944d0c9c2a151768