Merge "Fix incorrect javadoc link" am: 293ab4941b
am: d96fe8ddd0

Change-Id: I0331d98eb989ee429eb0ef38c448eae551130118