[automerger skipped]Merge "Change null behavior of getCellBandwidths" am: d3e1c76a99
am: a3376518a0  -s ours

Change-Id: I57ca17b78ef0a20d23e99312a719ab78ff393ab8