Merge "Merge "Fix @links in reference docs." into nyc-mr1-dev am: 3366d4beb4 am: 6cc3802e50 am: 44cafbb018" into nyc-mr2-dev-plus-aosp
am: 174a1f97e2

Change-Id: I4f1b1810827d454c7e74d08198d918682f292134