Merge "Fix bad javadoc link"
am: b002876a41

Change-Id: Ice995ed38d6e5dcb0a917a6e47cec8f40e7b485d