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

Change-Id: Ia552668066598993fd00749f83c9a2880785f26c