Indian Prime Minister Modi will visit China to attend BRICS summit, following end of tense border stand-off