Merge "Fix build: Revert "Properly set up local transport data dirs after an initialize operation""