Merge "Fix bad javadoc link" am: b002876a41
am: b6aaed3796

Change-Id: Ic8767b6afc40789a6b6c11c20edc61ede8da3c87