Merge "Change null behavior of getCellBandwidths"