Mayank Agarwal replaces Rohit Sharma in India ODI team\, Prithvi Shaw returns to Test team