China replaces diplomat known for 'hands in pockets' incident with Japan