am a83bef59: Merge change 6396 into donut

Merge commit 'a83bef597430e9336566ca38330cc0f4e793abe1'

* commit 'a83bef597430e9336566ca38330cc0f4e793abe1':
  Add unit test for NeighboringCellInfo.