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

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