Merge "Add ENONET to OsConstants"