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

Change-Id: I7eb88ae0987e164542acc988cd031f1da4afd376