Merge "Fix @links in reference docs. am: 54de77470d am: ab978c035e am: de2557f369" into nyc-mr2-dev-plus-aosp