am 1fd2c158: am 32271c3d: Tweak calculation for number of columns and rows

* commit '1fd2c15858d673eb8bd0940045bc09b6bf73335f':
  Tweak calculation for number of columns and rows