HCM City to resume waterway transport