Merge "Remove getNeighboringCell API"