Merge "Revert "Soft-enable MAC address restrictions with allowlist.""