Merge "Fix incorrect javadoc link"
am: 293ab4941b

Change-Id: Id288e51e79c867728e06caa8ee68bf28bd2dcbf5