Merge "doc change: a misplaced link removed" into honeycomb-mr1