Merge "Fix root_filesystem_config.txt generation"