am 6e8087f4: Merge "Correct off-by-1 errors in display formatting code." into mnc-dev

* commit '6e8087f483c13288bd589389414d9ed35ab73c31':
  Correct off-by-1 errors in display formatting code.