Merge change 6396 into donut

* changes:
  Add unit test for NeighboringCellInfo.