Merge "Construct NeighborCell from CellInfo"
am: 22eca8caf0

Change-Id: Ia2e1faefc7d6805475e31843e33e44728d6154f4