Merge "fs_config: Fix oem range parsing"