Merge "Make CellLocation and CellInfo nonblocking"