Merge "Construct NeighborCell from CellInfo" am: 22eca8caf0 am: ad522a33cd am: 38efcb96f5
am: ee5afe67ea

Change-Id: I76327c91240f3918686f07cf3d11d02667e1002f