Merge "fs_mgr: Don't parse encryption options, just keep string"