The shuttle will be bringing back Japanese astronaut Koichi Wakata , who has been on the space station since March .