Merge "Fix javadoc {@link}"
am: 4b4f210ced

Change-Id: I68d8d09f1d2d491bb555b87d8b1c178683d1a11f