Merge "fs_mgr: Allow commas in boot device paths."