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

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