Merge "Relax char limit on Modified table header from 12 to 18." into nyc-andromeda-dev