Merge "Merge "Avoid weird line wrapping by removing columns and forcing line...
Merge "Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs am: a0acf474 am: 592b36a3 am: 0b019a3d am: 1d145e7d am: 231adb3e" into nyc-mr1-dev-plus-aosp