Merge "Fix legacy OBB data migration path"