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

Change-Id: Ie601224c69c73894e904d7c0670a113ec61469a8