Merge "Add OsConstants#ENONET to public API"