HCM City to develop riverine infrastructure, economy