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

Change-Id: Ia08f614428f5c08cb6a148115300d9bf65274b3d