PM Modi will visit Tokyo, Japan from 23-24 May at the invitation of Japanese Prime Minister Fumio Kishida.