Merge "Doc change: fixing broken links/images" into honeycomb